diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-07 20:25:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-07 20:25:10 -0400 |
commit | 43c40df2c7fedce640a6c39fcdf58764f6bbac5c (patch) | |
tree | bb55c6ad7db5d91f6066d2c4e36d270522ff27d0 /drivers/hid/Kconfig | |
parent | 7385d6fd88dd7981cdef8aa91e46570e5ba068c8 (diff) | |
parent | e661c8978e4833d4148d08b405a2f3175d6f97d9 (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
Pull LED updates from Bryan Wu:
"This cycle we got:
- a fix of attribute-creation race for the whole leds subsystem
- new drivers (HID:GT683R, leds-ipaq-micro)
- other fixing and clean up"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (23 commits)
leds: ipaq-micro: fix sparse non static symbol warning
leds: add driver for the iPAQ micro
Documentation: dts: tcs6507: Fix wrong statement about #gpio-cells
leds: convert blink timer to workqueue
leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default
leds:pca963x: Always initialize MODE2 register
leds:pca963x: Add support for PCA9635 LED driver chip
HID: gt683r: move mode attribute to led-class devices
HID: gt683r: fix race condition
HID: add support for MSI GT683R led panels
leds: lp55xx-common: fix attribute-creation race
leds: lp55xx-common: fix sysfs entry leak
input: lm8323: fix attribute-creation race
leds: wm831x-status: fix attribute-creation race
leds: ss4200: fix attribute-creation race
leds: ns2: fix attribute-creation race
leds: netxbig: fix attribute-creation race
leds: max8997: fix attribute-creation race
leds: lm3642: fix attribute-creation race
leds: lm355x: fix attribute-creation race
...
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r-- | drivers/hid/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e02cf59b048d..ec48c823b157 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -261,6 +261,20 @@ config HOLTEK_FF | |||
261 | Say Y here if you have a Holtek On Line Grip based game controller | 261 | Say Y here if you have a Holtek On Line Grip based game controller |
262 | and want to have force feedback support for it. | 262 | and want to have force feedback support for it. |
263 | 263 | ||
264 | config HID_GT683R | ||
265 | tristate "MSI GT68xR LED support" | ||
266 | depends on LEDS_CLASS && USB_HID | ||
267 | ---help--- | ||
268 | Say Y here if you want to enable support for the three MSI GT68xR LEDs | ||
269 | |||
270 | This driver support following modes: | ||
271 | - Normal: LEDs are fully on when enabled | ||
272 | - Audio: LEDs brightness depends on sound level | ||
273 | - Breathing: LEDs brightness varies at human breathing rate | ||
274 | |||
275 | Currently the following devices are know to be supported: | ||
276 | - MSI GT683R | ||
277 | |||
264 | config HID_HUION | 278 | config HID_HUION |
265 | tristate "Huion tablets" | 279 | tristate "Huion tablets" |
266 | depends on USB_HID | 280 | depends on USB_HID |