ar71xx: fix 'section type conflict' build error

[openwrt.git] / target / linux / s3c24xx / patches-2.6.30 / 057-lis302dl.patch

diff --git a/target/linux/s3c24xx/patches-2.6.30/057-lis302dl.patch b/target/linux/s3c24xx/patches-2.6.30/057-lis302dl.patch
index df90f5f..ebb194b 100644 (file)
--- a/target/linux/s3c24xx/patches-2.6.30/057-lis302dl.patch
+++ b/target/linux/s3c24xx/patches-2.6.30/057-lis302dl.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.30-rc6/drivers/input/misc/Kconfig
-===================================================================
---- linux-2.6.30-rc6.orig/drivers/input/misc/Kconfig   2009-05-18 19:07:07.000000000 +0200
-+++ linux-2.6.30-rc6/drivers/input/misc/Kconfig        2009-05-18 19:08:33.000000000 +0200
-@@ -220,6 +220,15 @@
+--- a/drivers/input/misc/Kconfig
++++ b/drivers/input/misc/Kconfig
+@@ -220,6 +220,15 @@ config HP_SDC_RTC

          Say Y here if you want to support the built-in real time clock
          of the HP SDC controller.
  
          Say Y here if you want to support the built-in real time clock
          of the HP SDC controller.
  


@@ -18,11 +16,9 @@ Index: linux-2.6.30-rc6/drivers/input/misc/Kconfig
  config INPUT_PCF50633_PMU
        tristate "PCF50633 PMU events"
        depends on MFD_PCF50633
  config INPUT_PCF50633_PMU
        tristate "PCF50633 PMU events"
        depends on MFD_PCF50633

-Index: linux-2.6.30-rc6/drivers/input/misc/Makefile
-===================================================================
---- linux-2.6.30-rc6.orig/drivers/input/misc/Makefile  2009-05-18 19:07:07.000000000 +0200
-+++ linux-2.6.30-rc6/drivers/input/misc/Makefile       2009-05-18 19:08:33.000000000 +0200
-@@ -25,3 +25,4 @@
+--- a/drivers/input/misc/Makefile
++++ b/drivers/input/misc/Makefile
+@@ -25,3 +25,4 @@ obj-$(CONFIG_INPUT_UINPUT)           += uinput.o

  obj-$(CONFIG_INPUT_WISTRON_BTNS)      += wistron_btns.o
  obj-$(CONFIG_INPUT_YEALINK)           += yealink.o
  obj-$(CONFIG_INPUT_GPIO_BUTTONS)      += gpio_buttons.o
  obj-$(CONFIG_INPUT_WISTRON_BTNS)      += wistron_btns.o
  obj-$(CONFIG_INPUT_YEALINK)           += yealink.o
  obj-$(CONFIG_INPUT_GPIO_BUTTONS)      += gpio_buttons.o