merge netfilter kernel changes to 2.6.26 as well

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 410-gpio_buttons.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
index 45e8448..46ca987 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/drivers/input/misc/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/input/misc/Kconfig
-+++ linux-2.6.25.4/drivers/input/misc/Kconfig
+--- a/drivers/input/misc/Kconfig
++++ b/drivers/input/misc/Kconfig
 @@ -197,4 +197,20 @@ config HP_SDC_RTC
          Say Y here if you want to support the built-in real time clock
          of the HP SDC controller.
@@ -23,10 +21,8 @@ Index: linux-2.6.25.4/drivers/input/misc/Kconfig
 +        module will be called gpio-buttons.
 +
  endif
-Index: linux-2.6.25.4/drivers/input/misc/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/input/misc/Makefile
-+++ linux-2.6.25.4/drivers/input/misc/Makefile
+--- a/drivers/input/misc/Makefile
++++ b/drivers/input/misc/Makefile
 @@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK)          += yealink.
  obj-$(CONFIG_HP_SDC_RTC)              += hp_sdc_rtc.o
  obj-$(CONFIG_INPUT_UINPUT)            += uinput.o