aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-04-18 18:35:47 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-04-18 18:35:47 +0000
commit78981f6f3c3fa003b7c9c351a1c902027fa1d1cd (patch)
tree3d48afe764021b9292fe61bfc90efc9e44d67298 /target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch
parent8c0ee9484b18f1db5fb901829706626bf5fc5a26 (diff)
downloadupstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.tar.gz
upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.tar.bz2
upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.zip
kernel: refresh patches with 2.6.34-rc4
SVN-Revision: 20999
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch
index b762ddea5d..e38c31de40 100644
--- a/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch
@@ -1,6 +1,6 @@
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
-@@ -319,4 +319,20 @@ config INPUT_PCAP
+@@ -340,4 +340,20 @@ config INPUT_PCAP
To compile this driver as a module, choose M here: the
module will be called pcap_keys.
@@ -23,7 +23,7 @@
endif
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
-@@ -30,4 +30,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR) += winb
+@@ -32,4 +32,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR) += winb
obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
obj-$(CONFIG_INPUT_YEALINK) += yealink.o