From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Sep 2015 18:40:40 +0000 (-0700)
Subject: Merge tag 'backlight-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.3-rc1~78
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=670c039deeffb5c0a3a900de53b95dba781aaf89

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
---

670c039deeffb5c0a3a900de53b95dba781aaf89
diff --cc drivers/leds/Makefile
index 6a943d16ecab,abe96d960ebe..b503f92dc2c4
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@@ -63,9 -63,7 +63,8 @@@ obj-$(CONFIG_LEDS_BLINKM)		+= leds-blin
  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
  
  # LED SPI Drivers
  obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o