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

Pull input subsystem updates from Dmitry Torokhov:
 "A few small fixups for cyttsp, wacom and xpad drivers"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllers
  Input: wacom - add a new stylus (0x100802) for Intuos5 and Cintiqs
  Input: add missing dependencies on CONFIG_HAS_IOMEM
  Input: cyttsp - fix swapped mfg_stat and mfg_cmd registers
  Input: cyttsp - add missing handshake
  Input: cyttsp - fix memcpy size param

diff --combined drivers/input/keyboard/Kconfig
index 62a2c0e4cc998774e1c12185b4f04369bbde4d28,c62ca1b47a37d29f1164e7e57c3d7964a532be96..7ac9c9818d5562c5d3970ec8e59f4df63ce2aba7
--- 1/drivers/input/keyboard/Kconfig
--- 2/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -175,7 -175,7 +175,7 @@@ config KEYBOARD_EP93X
  
  config KEYBOARD_GPIO
        tristate "GPIO Buttons"
 -      depends on GENERIC_GPIO
 +      depends on GPIOLIB
        help
          This driver implements support for buttons connected
          to GPIO pins of various CPUs (and some other chips).
@@@ -190,7 -190,7 +190,7 @@@
  
  config KEYBOARD_GPIO_POLLED
        tristate "Polled GPIO buttons"
 -      depends on GENERIC_GPIO
 +      depends on GPIOLIB
        select INPUT_POLLDEV
        help
          This driver implements support for buttons connected
@@@ -241,7 -241,7 +241,7 @@@ config KEYBOARD_TCA841
  
  config KEYBOARD_MATRIX
        tristate "GPIO driven matrix keypad support"
 -      depends on GENERIC_GPIO
 +      depends on GPIOLIB
        select INPUT_MATRIXKMAP
        help
          Enable support for GPIO driven matrix keypad.
@@@ -431,6 -431,7 +431,7 @@@ config KEYBOARD_TEGR
  
  config KEYBOARD_OPENCORES
        tristate "OpenCores Keyboard Controller"
+       depends on HAS_IOMEM
        help
          Say Y here if you want to use the OpenCores Keyboard Controller
          http://www.opencores.org/project,keyboardcontroller
@@@ -628,16 -629,4 +629,16 @@@ config KEYBOARD_W90P91
          To compile this driver as a module, choose M here: the
          module will be called w90p910_keypad.
  
 +config KEYBOARD_CROS_EC
 +      tristate "ChromeOS EC keyboard"
 +      select INPUT_MATRIXKMAP
 +      depends on MFD_CROS_EC
 +      help
 +        Say Y here to enable the matrix keyboard used by ChromeOS devices
 +        and implemented on the ChromeOS EC. You must enable one bus option
 +        (MFD_CROS_EC_I2C or MFD_CROS_EC_SPI) to use this.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called cros_ec_keyb.
 +
  endif