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:
  Input: move input-polldev to drivers/input
  Input: i8042 - add ULI EV4873 to noloop list
  Input: i8042 - add ASUS P65UP5 to the noloop list
  Input: usbtouchscreen - fix fallout caused by move from drivers/usb

diff --combined drivers/input/Kconfig
index f814fb3,3cfff40..2d87357
--- 1/drivers/input/Kconfig
--- 2/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@@ -3,7 -3,6 +3,7 @@@
  #
  
  menu "Input device support"
 +      depends on !S390
  
  config INPUT
        tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED
@@@ -39,6 -38,19 +39,19 @@@ config INPUT_FF_MEMLES
          To compile this driver as a module, choose M here: the
          module will be called ff-memless.
  
+ config INPUT_POLLDEV
+       tristate "Polled input device skeleton"
+       help
+         Say Y here if you are using a driver for an input
+         device that periodically polls hardware state. This
+         option is only useful for out-of-tree drivers since
+         in-tree drivers select it automatically.
+ 
+         If unsure, say N.
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called input-polldev.
+ 
  comment "Userland interfaces"
  
  config INPUT_MOUSEDEV

diff --combined drivers/input/misc/Kconfig
index 842a7b4,98ddafa..88e2907
--- 1/drivers/input/misc/Kconfig
--- 2/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@@ -84,7 -84,6 +84,7 @@@ config INPUT_ATLAS_BTN
  
  config INPUT_ATI_REMOTE
        tristate "ATI / X10 USB RF remote control"
 +      depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
@@@ -100,7 -99,6 +100,7 @@@
  
  config INPUT_ATI_REMOTE2
        tristate "ATI / Philips USB RF remote control"
 +      depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use an ATI or Philips USB RF remote control.
@@@ -116,7 -114,6 +116,7 @@@
  config INPUT_KEYSPAN_REMOTE
        tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
        depends on EXPERIMENTAL
 +      depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use a Keyspan DMR USB remote control.
@@@ -131,7 -128,6 +131,7 @@@
  
  config INPUT_POWERMATE
        tristate "Griffin PowerMate and Contour Jog support"
 +      depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use Griffin PowerMate or Contour Jog devices.
@@@ -148,7 -144,6 +148,7 @@@
  config INPUT_YEALINK
        tristate "Yealink usb-p1k voip phone"
        depends EXPERIMENTAL
 +      depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to enable keyboard and LCD functions of the
@@@ -170,17 -165,6 +170,6 @@@ config INPUT_UINPU
          To compile this driver as a module, choose M here: the
          module will be called uinput.
  
- config INPUT_POLLDEV
-       tristate "Polled input device skeleton"
-       help
-         Say Y here if you are using a driver for an input
-         device that periodically polls hardware state. This
-         option is only useful for out-of-tree drivers since
-         in-tree drivers select it automatically.
- 
-         To compile this driver as a module, choose M here: the
-         module will be called input-polldev.
- 
  config HP_SDC_RTC
        tristate "HP SDC Real Time Clock"
        depends on GSC || HP300