Fix a potential NULL pointer dereference in write_bulk_callback() in drivers/net...

[linux-2.6] / drivers / input / Kconfig

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 58223b5d842a00059c9d6b0ee30a45417fd0961a..2d87357e2b2b5fa38217201fa5ea900f11afe6c8 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
@@ -24,6 +25,33 @@ config INPUT
 
 if INPUT
 
+config INPUT_FF_MEMLESS
+       tristate "Support for memoryless force-feedback devices"
+       default n
+       ---help---
+         Say Y here if you have memoryless force-feedback input device
+         such as Logitech WingMan Force 3D, ThrustMaster FireStorm Dual
+         Power 2, or similar. You will also need to enable hardware-specific
+         driver.
+
+         If unsure, say N.
+
+         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
@@ -139,6 +167,8 @@ source "drivers/input/mouse/Kconfig"
 
 source "drivers/input/joystick/Kconfig"
 
+source "drivers/input/tablet/Kconfig"
+
 source "drivers/input/touchscreen/Kconfig"
 
 source "drivers/input/misc/Kconfig"