diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 12:06:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 12:06:10 -0400 |
| commit | 4162877d3ffa900b618c369c490c7faa6af60e47 (patch) | |
| tree | 5e87df9b3cdf07dcdc072bfdddadef4eb04c18ca /drivers/leds/Kconfig | |
| parent | 6c61403a446b5ee54c21cecabdc821acf06f96bf (diff) | |
| parent | 14f5716bc23cebb627b40a2808e9f04eb77ab206 (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:
- new driver for leds-mc13783
- bug fixes
- code cleanup"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
leds: make sure we unregister a trigger only once
leds: leds-pwm: properly clean up after probe failure
leds: clevo-mail: Make probe function __init
leds-ot200: Fix dependencies
leds-gpio: of: introduce MODULE_DEVICE_TABLE for module autoloading
leds: clevo-mail: remove __initdata marker
leds: leds-ss4200: remove __initdata marker
leds: blinkm: remove unnecessary spaces
leds: lp5562: remove unnecessary parentheses
leds: leds-ss4200: remove DEFINE_PCI_DEVICE_TABLE macro
leds: leds-s3c24xx: Trivial cleanup in header file
drivers/leds: delete non-required instances of include <linux/init.h>
leds: leds-gpio: add retain-state-suspended property
leds: leds-mc13783: Add devicetree support
leds: leds-mc13783: Remove unnecessary cleaning of registers on exit
leds: leds-mc13783: Use proper "max_brightness" value fo LEDs
leds: leds-mc13783: Use LED core PM functions
leds: leds-mc13783: Add MC34708 LED support
leds: Turn off led if blinking is disabled
ledtrig-cpu: Handle CPU hot(un)plugging
Diffstat (limited to 'drivers/leds/Kconfig')
| -rw-r--r-- | drivers/leds/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 44c358ecf5a1..6de9dfbf61c1 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
| @@ -416,7 +416,7 @@ config LEDS_MC13783 | |||
| 416 | depends on MFD_MC13XXX | 416 | depends on MFD_MC13XXX |
| 417 | help | 417 | help |
| 418 | This option enable support for on-chip LED drivers found | 418 | This option enable support for on-chip LED drivers found |
| 419 | on Freescale Semiconductor MC13783/MC13892 PMIC. | 419 | on Freescale Semiconductor MC13783/MC13892/MC34708 PMIC. |
| 420 | 420 | ||
| 421 | config LEDS_NS2 | 421 | config LEDS_NS2 |
| 422 | tristate "LED support for Network Space v2 GPIO LEDs" | 422 | tristate "LED support for Network Space v2 GPIO LEDs" |
| @@ -474,7 +474,7 @@ config LEDS_LM355x | |||
| 474 | 474 | ||
| 475 | config LEDS_OT200 | 475 | config LEDS_OT200 |
| 476 | tristate "LED support for the Bachmann OT200" | 476 | tristate "LED support for the Bachmann OT200" |
| 477 | depends on LEDS_CLASS && HAS_IOMEM | 477 | depends on LEDS_CLASS && HAS_IOMEM && (X86_32 || COMPILE_TEST) |
| 478 | help | 478 | help |
| 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. |