Merge branch 'for-4.8/hid-led' into for-linus

[sfrench/cifs-2.6.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 5646ca4b95de1cc616be21e163374f1473d41478..78ac4811bd3c0c0683e62bfe424c43c0fba4c8a9 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -388,6 +388,21 @@ config HID_LCPOWER
        ---help---
        Support for LC-Power RC1000MCE RF remote control.
 
+config HID_LED
+       tristate "Simple RGB LED support"
+       depends on HID
+       depends on LEDS_CLASS
+       ---help---
+       Support for simple RGB LED devices. Currently supported are:
+       - Riso Kagaku Webmail Notifier
+       - Dream Cheeky Webmail Notifier and Friends Alert
+       - ThingM blink(1)
+       - Delcom Visual Signal Indicator Generation 2
+       - Greynut Luxafor
+
+       To compile this driver as a module, choose M here: the
+       module will be called hid-led.
+
 config HID_LENOVO
        tristate "Lenovo / Thinkpad devices"
        depends on HID
@@ -819,11 +834,11 @@ config HID_THINGM
        tristate "ThingM blink(1) USB RGB LED"
        depends on HID
        depends on LEDS_CLASS
+       select HID_LED
        ---help---
-       Support for the ThingM blink(1) USB RGB LED. This driver registers a
-       Linux LED class instance, plus additional sysfs attributes to control
-       RGB colors, fade time and playing. The device is exposed through hidraw
-       to access other functions.
+       Support for the ThingM blink(1) USB RGB LED. This driver has been
+       merged into the generic hid led driver. Config symbol HID_THINGM
+       just selects HID_LED and will be removed soon.
 
 config HID_THRUSTMASTER
        tristate "ThrustMaster devices support"
@@ -936,6 +951,14 @@ config HID_SENSOR_CUSTOM_SENSOR
          standard sensors.
          Select this config option for custom/generic sensor support.
 
+config HID_ALPS
+       tristate "Alps HID device support"
+       depends on HID
+       ---help---
+       Support for Alps I2C HID touchpads and StickPointer.
+       Say Y here if you have a Alps touchpads over i2c-hid or usbhid
+       and want support for its special functionalities.
+
 endmenu
 
 endif # HID