Merge branches 'core/futexes', 'core/locking', 'core/rcu' and 'linus' into core/urgent

[pandora-kernel.git] / drivers / input / Kconfig

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 63512d9..5f9d860 100644 (file)
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -137,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"