diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-07-28 10:49:23 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-07-28 10:49:23 +0200 |
| commit | 8c2f421c1f0fa7768767ecaad497aa676fc9015a (patch) | |
| tree | c4e2ed4855fdc0dcbc038f6198f0330f3c9c3fdf /drivers/hid/Kconfig | |
| parent | e82a82c19f4272ea5437cc76e5711b98e2ee6223 (diff) | |
| parent | f4c109b660fa1d0453a6dde75bef725304687832 (diff) | |
| download | linux-8c2f421c1f0fa7768767ecaad497aa676fc9015a.tar.gz linux-8c2f421c1f0fa7768767ecaad497aa676fc9015a.tar.xz | |
Merge branch 'for-4.8/hid-led' into for-linus
Conflicts:
drivers/hid/hid-thingm.c
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index a8e480849a32..78ac4811bd3c 100644 --- 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" |