nfsd: nfsd should drop CAP_MKNOD for non-root

[safe/jmp/linux-2.6] / drivers / input / Kconfig

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 0e9b695..5f9d860 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
@@ -100,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
@@ -145,6 +137,27 @@ config INPUT_EVBUG
          To compile this driver as a module, choose M here: the
          module will be called evbug.
 
+config INPUT_APMPOWER
+       tristate "Input Power Event -> APM Bridge" if EMBEDDED
+       depends on INPUT && APM_EMULATION
+       ---help---
+         Say Y here if you want suspend key events to trigger a user
+         requested suspend through APM. This is useful on embedded
+         systems where such behviour is desired without userspace
+         interaction. If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called apm-power.
+
+config XEN_KBDDEV_FRONTEND
+       tristate "Xen virtual keyboard and mouse support"
+       depends on XEN_FBDEV_FRONTEND
+       default y
+       help
+         This driver implements the front-end of the Xen virtual
+         keyboard and mouse device driver.  It communicates with a back-end
+         in another domain.
+
 comment "Input Device Drivers"
 
 source "drivers/input/keyboard/Kconfig"