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: (51 commits)
  Input: appletouch - give up maintainership
  Input: dm355evm_kbd - switch to using sparse keymap library
  Input: wistron_btns - switch to using sparse keymap library
  Input: add generic support for sparse keymaps
  Input: fix memory leak in force feedback core
  Input: wistron - remove identification strings from DMI table
  Input: psmouse - remove identification strings from DMI tables
  Input: atkbd - remove identification strings from DMI table
  Input: i8042 - remove identification strings from DMI tables
  DMI: allow omitting ident strings in DMI tables
  Input: psmouse - do not carry DMI data around
  Input: matrix-keypad - switch to using dev_pm_ops
  Input: keyboard - fix lack of locking when traversing handler->h_list
  Input: gpio_keys - scan gpio state at probe and resume time
  Input: keyboard - add locking around event handling
  Input: usbtouchscreen - add support for ET&T TC5UH touchscreen controller
  Input: xpad - add two new Xbox 360 devices
  Input: polled device - do not start polling if interval is zero
  Input: polled device - schedule first poll immediately
  Input: add S3C24XX touchscreen driver
  ...

1 files changed, 36 insertions, 1 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 8cc453c85ea7..32fc8ba039aa 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -111,6 +111,18 @@ config TOUCHSCREEN_DA9034
           Say Y here to enable the support for the touchscreen found
           on Dialog Semiconductor DA9034 PMIC.
 
+config TOUCHSCREEN_DYNAPRO
+        tristate "Dynapro serial touchscreen"
+        select SERIO
+        help
+          Say Y here if you have a Dynapro serial touchscreen connected to
+          your system.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called dynapro.
+
 config TOUCHSCREEN_EETI
         tristate "EETI touchscreen panel support"
         depends on I2C
@@ -133,6 +145,18 @@ config TOUCHSCREEN_FUJITSU
           To compile this driver as a module, choose M here: the
           module will be called fujitsu-ts.
 
+config TOUCHSCREEN_S3C2410
+        tristate "Samsung S3C2410 touchscreen input driver"
+        depends on ARCH_S3C2410
+        select S3C24XX_ADC
+        help
+          Say Y here if you have the s3c2410 touchscreen.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called s3c2410_ts.
+
 config TOUCHSCREEN_GUNZE
         tristate "Gunze AHL-51S touchscreen"
         select SERIO
@@ -297,7 +321,7 @@ config TOUCHSCREEN_TOUCHWIN
 
 config TOUCHSCREEN_ATMEL_TSADCC
         tristate "Atmel Touchscreen Interface"
-        depends on ARCH_AT91SAM9RL
+        depends on ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
         help
           Say Y here if you have a 4-wire touchscreen connected to the
           ADC Controller on your Atmel SoC (such as the AT91SAM9RL).
@@ -418,6 +442,7 @@ config TOUCHSCREEN_USB_COMPOSITE
           - IdealTEK URTC1000
           - GoTop Super_Q2/GogoPen/PenPower tablets
           - JASTEC USB Touch Controller/DigiTech DTR-02U
+          - Zytronic controllers
 
           Have a look at <http://linux.chapter7.ch/touchkit/> for
           a usage description and the required user-space stuff.
@@ -490,6 +515,16 @@ config TOUCHSCREEN_USB_E2I
         bool "e2i Touchscreen controller (e.g. from Mimo 740)"
         depends on TOUCHSCREEN_USB_COMPOSITE
 
+config TOUCHSCREEN_USB_ZYTRONIC
+        default y
+        bool "Zytronic controller" if EMBEDDED
+        depends on TOUCHSCREEN_USB_COMPOSITE
+
+config TOUCHSCREEN_USB_ETT_TC5UH
+        default y
+        bool "ET&T TC5UH touchscreen controler support" if EMBEDDED
+        depends on TOUCHSCREEN_USB_COMPOSITE
+
 config TOUCHSCREEN_TOUCHIT213
         tristate "Sahara TouchIT-213 touchscreen"
         select SERIO