diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:52:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:52:36 -0400 |
| commit | d6b92c2c373e0beefa8048c1448992cd5cda6e07 (patch) | |
| tree | 9650bc989b34df3fcf1e076d9d65cda00e33a894 /drivers/leds | |
| parent | 1aacb90eaaac057c10fd746e189553e04cfeb291 (diff) | |
| parent | beea3f4a29e76561a3aa02cf5314c91a06150f60 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid into next
Pull HID patches from Jiri Kosina:
- RMI driver for Synaptics touchpads, by Benjamin Tissoires, Andrew
Duggan and Jiri Kosina
- cleanup of hid-sony driver and improved support for Sixaxis and
Dualshock 4, by Frank Praznik
- other usual small fixes and support for new device IDs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (29 commits)
HID: thingm: thingm_fwinfo[] doesn't need to be global
HID: core: add two new usages for digitizer
HID: hid-sensor-hub: new device id and quirk for STM Sensor hub
HID: usbhid: enable NO_INIT_REPORTS quirk for Semico USB Keykoard
HID: hid-sensor-hub: Set report quirk for Microsoft Surface
HID: debug: add labels for HID Sensor Usages
HID: uhid: Use kmemdup instead of kmalloc + memcpy
HID: rmi: do not handle touchscreens through hid-rmi
HID: quirk for Saitek RAT7 and MMO7 mices' mode button
HID: core: fix validation of report id 0
HID: rmi: fix masks for x and w_x data
HID: rmi: fix wrong struct field name
HID: rmi: do not fetch more than 16 bytes in a query
HID: rmi: check for the existence of some optional queries before reading query 12
HID: i2c-hid: hid report descriptor retrieval changes
HID: add missing hid usages
HID: hid-sony - allow 3rd party INTEC controller to turn off all leds
HID: sony: Add blink support to the Sixaxis and DualShock 4 LEDs
HID: sony: Initialize the controller LEDs with a device ID value
HID: sony: Use the controller Bluetooth MAC address as the unique value in the battery name string
...
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 39e717797cc0..089841ca180f 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
| @@ -479,6 +479,8 @@ config LEDS_OT200 | |||
| 479 | This option enables support for the LEDs on the Bachmann OT200. | 479 | This option enables support for the LEDs on the Bachmann OT200. |
| 480 | Say Y to enable LEDs on the Bachmann OT200. | 480 | Say Y to enable LEDs on the Bachmann OT200. |
| 481 | 481 | ||
| 482 | comment "LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)" | ||
| 483 | |||
| 482 | config LEDS_BLINKM | 484 | config LEDS_BLINKM |
| 483 | tristate "LED support for the BlinkM I2C RGB LED" | 485 | tristate "LED support for the BlinkM I2C RGB LED" |
| 484 | depends on LEDS_CLASS | 486 | depends on LEDS_CLASS |