diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-04 11:40:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-04 11:40:40 -0700 |
commit | 670c039deeffb5c0a3a900de53b95dba781aaf89 (patch) | |
tree | 2a145c07e601b85956048d030b43dda745c596d0 /drivers/leds/Kconfig | |
parent | 8bd8fd0a29bfd5ad8e1976edd8c4c40cdb39aa4f (diff) | |
parent | 13d20b3b618adc43168b034792eec57063b5ec6f (diff) |
Merge tag 'backlight-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
- Stop using LP855X Platform Data to control regulators
- Move PWM8941 WLED driver into Backlight
- Remove invalid use of IS_ERR_VALUE() macro
- Remove duplicate check for NULL data before unregistering
- Export I2C Device ID structure
* tag 'backlight-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: tosa: Export I2C module alias information
backlight: lp8788_bl: Delete a check before backlight_device_unregister()
backlight: sky81452: Remove unneeded use of IS_ERR_VALUE() macro
backlight: pm8941-wled: Move PM8941 WLED driver to backlight
backlight: lp855x: Use private data for regulator control
Diffstat (limited to 'drivers/leds/Kconfig')
-rw-r--r-- | drivers/leds/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index bea24bd4d519..70f4255ff291 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -594,14 +594,6 @@ config LEDS_VERSATILE This option enabled support for the LEDs on the ARM Versatile and RealView boards. Say Y to enabled these. -config LEDS_PM8941_WLED - tristate "LED support for the Qualcomm PM8941 WLED block" - depends on LEDS_CLASS - select REGMAP - help - This option enables support for the 'White' LED block - on Qualcomm PM8941 PMICs. - comment "LED Triggers" source "drivers/leds/trigger/Kconfig" |