Merge branch 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 432699d61c58ed3e8b39d4d5d250b045a972abc4..199055db5082e8020834e8883e3d502d7319bfb8 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -180,6 +180,19 @@ config INPUT_YEALINK
          To compile this driver as a module, choose M here: the module will be
          called yealink.
 
+config INPUT_CM109
+       tristate "C-Media CM109 USB I/O Controller"
+       depends on EXPERIMENTAL
+       depends on USB_ARCH_HAS_HCD
+       select USB
+       help
+         Say Y here if you want to enable keyboard and buzzer functions of the
+         C-Media CM109 usb phones. The audio part is enabled by the generic
+         usb sound driver, so you might want to enable that as well.
+
+         To compile this driver as a module, choose M here: the module will be
+         called cm109.
+
 config INPUT_UINPUT
        tristate "User level driver support"
        help
@@ -189,6 +202,16 @@ config INPUT_UINPUT
          To compile this driver as a module, choose M here: the
          module will be called uinput.
 
+config INPUT_SGI_BTNS
+       tristate "SGI Indy/O2 volume button interface"
+       depends on SGI_IP22 || SGI_IP32
+       select INPUT_POLLDEV
+       help
+         Say Y here if you want to support SGI Indy/O2 volume button interface.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sgi_btns.
+
 config HP_SDC_RTC
        tristate "HP SDC Real Time Clock"
        depends on GSC || HP300