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: (40 commits)
  Input: use full RCU API
  Input: remove tsdev interface
  Input: add support for Blackfin BF54x Keypad controller
  Input: appletouch - another fix for idle reset logic
  HWMON: hdaps - switch to using input-polldev
  Input: add support for SEGA Dreamcast keyboard
  Input: omap-keyboard - don't pretend we support changing keymap
  Input: lifebook - fix X and Y axis range
  Input: usbtouchscreen - add support for GeneralTouch devices
  Input: fix open count handling in input interfaces
  Input: keyboard - add CapsShift lock
  Input: adbhid - produce all CapsLock key events
  Input: ALPS - add signature for ThinkPad R61
  Input: jornada720_kbd - send MSC_SCAN events
  Input: add support for the HP Jornada 7xx (710/720/728) touchscreen
  Input: add support for HP Jornada 7xx onboard keyboard
  Input: add support for HP Jornada onboard keyboard (HP6XX)
  Input: ucb1400_ts - use schedule_timeout_uninterruptible
  Input: xpad - fix dependancy on LEDS class
  Input: auto-select INPUT for MAC_EMUMOUSEBTN option
  ...

Resolved conflicts manually in drivers/hwmon/applesmc.c: converting from
a class device to a device and converting to use input-polldev created a
few apparently trivial clashes..

1 files changed, 0 insertions, 22 deletions

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 2d87357e2b2b..63512d906f02 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -114,28 +114,6 @@ config INPUT_JOYDEV
           To compile this driver as a module, choose M here: the
           module will be called joydev.
 
-config INPUT_TSDEV
-        tristate "Touchscreen interface"
-        ---help---
-          Say Y here if you have an application that only can understand the
-          Compaq touchscreen protocol for absolute pointer data. This is
-          useful namely for embedded configurations.
-
-          If unsure, say N.
-
-          To compile this driver as a module, choose M here: the
-          module will be called tsdev.
-
-config INPUT_TSDEV_SCREEN_X
-        int "Horizontal screen resolution"
-        depends on INPUT_TSDEV
-        default "240"
-
-config INPUT_TSDEV_SCREEN_Y
-        int "Vertical screen resolution"
-        depends on INPUT_TSDEV
-        default "320"
-
 config INPUT_EVDEV
         tristate "Event interface"
         help