Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (22 commits)
  Input: i8042 - add HP DV9700 to the noloop list
  Input: arrange drivers/input/misc/Makefile in alphabetical order
  Input: add AD7879 Touchscreen driver
  Input: add AD7877 touchscreen driver
  Input: bf54x-keys - fix typo in warning
  Input: add driver for S1 button of rb532
  Input: generic driver for rotary encoders on GPIOs
  Input: hilkbd - fix crash when removing hilkbd module
  Input: atkbd - add quirk for Fujitsu Siemens Amilo PA 1510
  Input: atkbd - consolidate force release quirk setup
  Input: add accelerated touchscreen support for Marvell Zylonite
  Input: ucb1400_ts, mainstone-wm97xx - add BTN_TOUCH events
  Input: wm97xx - use disable_irq_nosync() for Mainstone
  Input: wm97xx - add BTN_TOUCH event to wm97xx to use it with Android
  Input: fix polling of /proc/bus/input/devices
  Input: psmouse - add newline to OLPC HGPK touchpad debugging
  Input: ati_remote2 - check module params
  Input: ati_remote2 - add per device attrs
  Input: ati_remote2 - complete suspend support
  Input: stop autorepeat timer on key release
  ...

1 files changed, 58 insertions, 0 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index bb6486a8c070..b01fd61dadcc 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -29,6 +29,51 @@ config TOUCHSCREEN_ADS7846
           To compile this driver as a module, choose M here: the
           module will be called ads7846.
 
+config TOUCHSCREEN_AD7877
+        tristate "AD7877 based touchscreens"
+        depends on SPI_MASTER
+        help
+          Say Y here if you have a touchscreen interface using the
+          AD7877 controller, and your board-specific initialization
+          code includes that in its table of SPI devices.
+
+          If unsure, say N (but it's safe to say "Y").
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad7877.
+
+config TOUCHSCREEN_AD7879_I2C
+        tristate "AD7879 based touchscreens: AD7879-1 I2C Interface"
+        depends on I2C
+        select TOUCHSCREEN_AD7879
+        help
+          Say Y here if you have a touchscreen interface using the
+          AD7879-1 controller, and your board-specific initialization
+          code includes that in its table of I2C devices.
+
+          If unsure, say N (but it's safe to say "Y").
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad7879.
+
+config TOUCHSCREEN_AD7879_SPI
+        tristate "AD7879 based touchscreens: AD7879 SPI Interface"
+        depends on SPI_MASTER && TOUCHSCREEN_AD7879_I2C = n
+        select TOUCHSCREEN_AD7879
+        help
+          Say Y here if you have a touchscreen interface using the
+          AD7879 controller, and your board-specific initialization
+          code includes that in its table of SPI devices.
+
+          If unsure, say N (but it's safe to say "Y").
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad7879.
+
+config TOUCHSCREEN_AD7879
+        tristate
+        default n
+
 config TOUCHSCREEN_BITSY
         tristate "Compaq iPAQ H3600 (Bitsy) touchscreen"
         depends on SA1100_BITSY
@@ -308,6 +353,19 @@ config TOUCHSCREEN_WM97XX_MAINSTONE
           To compile this driver as a module, choose M here: the
           module will be called mainstone-wm97xx.
 
+config TOUCHSCREEN_WM97XX_ZYLONITE
+        tristate "Zylonite accelerated touch"
+        depends on TOUCHSCREEN_WM97XX && MACH_ZYLONITE
+        select TOUCHSCREEN_WM9713
+        help
+          Say Y here for support for streaming mode with the touchscreen
+          on Zylonite systems.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called zylonite-wm97xx.
+
 config TOUCHSCREEN_USB_COMPOSITE
         tristate "USB Touchscreen Driver"
         depends on USB_ARCH_HAS_HCD