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

1 files changed, 0 insertions, 11 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 842a7b4d16f8..88e29074ac90 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -170,17 +170,6 @@ config INPUT_UINPUT
           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