OSDN Git Service

Merge remote-tracking branch 'backlight/for-backlight-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Aug 2015 02:13:42 +0000 (12:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Aug 2015 02:13:42 +0000 (12:13 +1000)
1  2 
drivers/leds/Kconfig
drivers/leds/Makefile

Simple merge
@@@ -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