diff options
| author | Linus Torvalds <[email protected]> | 2010-05-28 17:20:59 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-05-28 17:20:59 +0000 |
| commit | d372e7fe4698bde3a00b718f7901a0025dda47ef (patch) | |
| tree | 81050bd60d36605e13beedb7383980a1cdbd576c /drivers/leds/leds-gpio.c | |
| parent | tracing: fix for tracepoint API change (diff) | |
| parent | leds: Fix leds-gpio openfirmware compile issue (diff) | |
| download | kernel-d372e7fe4698bde3a00b718f7901a0025dda47ef.tar.gz kernel-d372e7fe4698bde3a00b718f7901a0025dda47ef.zip | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
leds: Fix leds-gpio openfirmware compile issue
leds: Kconfig fixes
Diffstat (limited to 'drivers/leds/leds-gpio.c')
| -rw-r--r-- | drivers/leds/leds-gpio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 26843dd6b859..cc22eeefa10b 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -250,7 +250,6 @@ static int __devinit of_gpio_leds_probe(struct of_device *ofdev, led.gpio = of_get_gpio_flags(child, 0, &flags); led.active_low = flags & OF_GPIO_ACTIVE_LOW; led.name = of_get_property(child, "label", NULL) ? : child->name; - led.blinking = 0; led.default_trigger = of_get_property(child, "linux,default-trigger", NULL); state = of_get_property(child, "default-state", NULL); |