diff options
| author | Linus Torvalds | 2015-09-04 11:40:40 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2015-09-04 11:40:40 -0700 |
| commit | 670c039deeffb5c0a3a900de53b95dba781aaf89 (patch) | |
| tree | 2a145c07e601b85956048d030b43dda745c596d0 /drivers/leds/Makefile | |
| 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/Makefile')
| -rw-r--r-- | drivers/leds/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index 6a943d16ecab..b503f92dc2c4 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -63,7 +63,6 @@ obj-$(CONFIG_LEDS_BLINKM) += leds-blinkm.o obj-$(CONFIG_LEDS_SYSCON) += leds-syscon.o obj-$(CONFIG_LEDS_VERSATILE) += leds-versatile.o obj-$(CONFIG_LEDS_MENF21BMC) += leds-menf21bmc.o -obj-$(CONFIG_LEDS_PM8941_WLED) += leds-pm8941-wled.o obj-$(CONFIG_LEDS_KTD2692) += leds-ktd2692.o obj-$(CONFIG_LEDS_POWERNV) += leds-powernv.o |