Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 98ddafa3053503186bf1af2abc878054fb06a866..9b26574f1466a179a8a7782931855f2d946e3947 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -65,9 +65,13 @@ config INPUT_COBALT_BTNS
 config INPUT_WISTRON_BTNS
        tristate "x86 Wistron laptop button interface"
        depends on X86 && !X86_64
+       select INPUT_POLLDEV
+       select NEW_LEDS
+       select LEDS_CLASS
        help
          Say Y here for support of Winstron laptop button interface, used on
-         laptops of various brands, including Acer and Fujitsu-Siemens.
+         laptops of various brands, including Acer and Fujitsu-Siemens. If
+         available, mail and wifi leds will be controlable via /sys/class/leds.
 
          To compile this driver as a module, choose M here: the module will
          be called wistron_btns.
@@ -84,6 +88,7 @@ config INPUT_ATLAS_BTNS
 
 config INPUT_ATI_REMOTE
        tristate "ATI / X10 USB RF remote control"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
@@ -99,6 +104,7 @@ config INPUT_ATI_REMOTE
 
 config INPUT_ATI_REMOTE2
        tristate "ATI / Philips USB RF remote control"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use an ATI or Philips USB RF remote control.
@@ -114,6 +120,7 @@ config INPUT_ATI_REMOTE2
 config INPUT_KEYSPAN_REMOTE
        tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
        depends on EXPERIMENTAL
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use a Keyspan DMR USB remote control.
@@ -128,6 +135,7 @@ config INPUT_KEYSPAN_REMOTE
 
 config INPUT_POWERMATE
        tristate "Griffin PowerMate and Contour Jog support"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use Griffin PowerMate or Contour Jog devices.
@@ -144,6 +152,7 @@ config INPUT_POWERMATE
 config INPUT_YEALINK
        tristate "Yealink usb-p1k voip phone"
        depends EXPERIMENTAL
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to enable keyboard and LCD functions of the