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 842a7b4d16f8c733dc19177edf3ea39176baf0d7..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.
@@ -170,17 +174,6 @@ config INPUT_UINPUT
          To compile this driver as a module, choose M here: the
          module will be called uinput.
 
-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.
-
-         To compile this driver as a module, choose M here: the
-         module will be called input-polldev.
-
 config HP_SDC_RTC
        tristate "HP SDC Real Time Clock"
        depends on GSC || HP300