linux/generic: refresh 2.6.36 kernel patches

SVN-Revision: 23237
This commit is contained in:
Alexandros C. Couloumbis
2010-10-05 08:50:54 +00:00
parent 978ecae685
commit 11c45f64fe
56 changed files with 270 additions and 328 deletions

View File

@@ -1,8 +1,8 @@
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -390,4 +390,20 @@ config INPUT_PCAP
@@ -438,4 +438,20 @@ config INPUT_ADXL34X_SPI
To compile this driver as a module, choose M here: the
module will be called pcap_keys.
module will be called adxl34x-spi.
+config INPUT_GPIO_BUTTONS
+ tristate "Polled GPIO buttons interface"
@@ -23,7 +23,7 @@
endif
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -37,4 +37,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR) += winb
@@ -41,4 +41,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