diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 13:08:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 13:08:09 -0700 |
| commit | 7c574cf6aeb75920ba4d3af937bb1b3c42785ac4 (patch) | |
| tree | 336586614fcbba9fb8fc6095d23f87d8ce11b559 /drivers/leds/Makefile | |
| parent | af76004cf8b4f368583bda22d7e348e40a338b91 (diff) | |
| parent | 0c9a03b68511daf078256367e7a98d7ff3b7dfcb (diff) | |
| download | linux-7c574cf6aeb75920ba4d3af937bb1b3c42785ac4.tar.bz2 | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
Pull LED updates from Bryan Wu:
"I just found merge window is open and I'm quite busy and almost forget
to send out this pull request. Thanks Russell and Alexandre ping me
about this.
So basically we got some clean up and leds-pwm fixing patches from
Russell"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
leds: Remove duplicated OOM message for individual driver
drivers/leds: Replace __get_cpu_var use through this_cpu_ptr
leds: lp55xx: add DT bindings for LP55231
leds: 88pm860x: Fix missing refcount decrement for parent of_node
leds: 88pm860x: Use of_get_child_by_name
leds: leds-pwm: add DT support for LEDs wired to supply
leds: leds-pwm: implement PWM inversion
leds: leds-pwm: convert OF parsing code to use led_pwm_add()
leds: leds-pwm: provide a common function to setup a single led-pwm device
leds: pca9685: Remove leds-pca9685 driver
dell-led: add mic mute led interface
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 8b4c956e11ba..79c5155199a7 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -36,7 +36,6 @@ obj-$(CONFIG_LEDS_OT200) += leds-ot200.o obj-$(CONFIG_LEDS_FSG) += leds-fsg.o obj-$(CONFIG_LEDS_PCA955X) += leds-pca955x.o obj-$(CONFIG_LEDS_PCA963X) += leds-pca963x.o -obj-$(CONFIG_LEDS_PCA9685) += leds-pca9685.o obj-$(CONFIG_LEDS_DA903X) += leds-da903x.o obj-$(CONFIG_LEDS_DA9052) += leds-da9052.o obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o |