resync patches for 2.6.30-rc3

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.30 / 410-gpio_buttons.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.30/410-gpio_buttons.patch
index 6077906ae36a78692f08c4a2978c5a4fc858e715..139d997dfb75e9526626d8f65b5af74a7b95a7c0 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/410-gpio_buttons.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/410-gpio_buttons.patch
@@ -1,8 +1,8 @@
 --- a/drivers/input/misc/Kconfig
 +++ b/drivers/input/misc/Kconfig
-@@ -227,4 +227,20 @@ config INPUT_PCF50633_PMU
-        Say Y to include support for delivering  PMU events via  input
-        layer on NXP PCF50633.
+@@ -250,4 +250,20 @@ config INPUT_RB532_BUTTON
+         To compile this driver as a module, choose M here: the
+         module will be called rb532_button.
  
 +config INPUT_GPIO_BUTTONS
 +      tristate "Polled GPIO buttons interface"
@@ -23,8 +23,8 @@
  endif
 --- a/drivers/input/misc/Makefile
 +++ b/drivers/input/misc/Makefile
-@@ -22,3 +22,4 @@ obj-$(CONFIG_INPUT_UINPUT)           += uinput.o
- obj-$(CONFIG_INPUT_APANEL)            += apanel.o
- obj-$(CONFIG_INPUT_SGI_BTNS)          += sgi_btns.o
- obj-$(CONFIG_INPUT_PCF50633_PMU)      += pcf50633-input.o
+@@ -24,3 +24,4 @@ obj-$(CONFIG_INPUT_SPARCSPKR)                += sparcs
+ 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