diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 16:27:42 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 16:27:42 +0900 |
| commit | 85b656cf1560e27a89354a23f2c10ba229d2f173 (patch) | |
| tree | 53c8b9d30c45dad618a704fd4a5b6aa5b95250cd /drivers/leds/leds-pwm.c | |
| parent | 2b684c073f32b557661eba191ce0a584020367e2 (diff) | |
| parent | 30dae2f98612d7c8cd855861b9de205ebd9ef4fa (diff) | |
| download | talos-op-linux-85b656cf1560e27a89354a23f2c10ba229d2f173.tar.gz talos-op-linux-85b656cf1560e27a89354a23f2c10ba229d2f173.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
Pull LED subsystem changes from Bryan Wu:
"LED subsystem updates for 3.13 are basically cleanup and also add a
new driver for PCA9685"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
leds: lp55xx: handle enable pin in driver
leds-gpio: of: led should not be created if its status is disabled
of: introduce of_get_available_child_count
leds: Added driver for the NXP PCA9685 I2C chip
leds: pwm: Remove redundant of_match_ptr
leds: Include linux/of.h header
leds: dac124s085: Remove redundant spi_set_drvdata
leds: lp55xx: enable setting default trigger
leds: blinkm: Remove redundant break
Diffstat (limited to 'drivers/leds/leds-pwm.c')
| -rw-r--r-- | drivers/leds/leds-pwm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c index bb6f94898541..2848171b8576 100644 --- a/drivers/leds/leds-pwm.c +++ b/drivers/leds/leds-pwm.c @@ -232,7 +232,7 @@ static struct platform_driver led_pwm_driver = { .driver = { .name = "leds_pwm", .owner = THIS_MODULE, - .of_match_table = of_match_ptr(of_pwm_leds_match), + .of_match_table = of_pwm_leds_match, }, }; |
