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

[powerpc.git] / drivers / input / Kconfig

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 0e9b695..2d87357 100644 (file)
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Input device support"
+       depends on !S390
 
 config INPUT
        tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED
@@ -38,6 +39,19 @@ config INPUT_FF_MEMLESS
          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