diff options
| -rw-r--r-- | drivers/leds/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/leds/leds-gpio.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index f98d17a7108b..81bf25e67ce1 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
| @@ -21,7 +21,7 @@ comment "LED drivers" | |||
| 21 | 21 | ||
| 22 | config LEDS_88PM860X | 22 | config LEDS_88PM860X |
| 23 | tristate "LED Support for Marvell 88PM860x PMIC" | 23 | tristate "LED Support for Marvell 88PM860x PMIC" |
| 24 | depends on LEDS_CLASS && MFD_88PM860X | 24 | depends on MFD_88PM860X |
| 25 | help | 25 | help |
| 26 | This option enables support for on-chip LED drivers found on Marvell | 26 | This option enables support for on-chip LED drivers found on Marvell |
| 27 | Semiconductor 88PM8606 PMIC. | 27 | Semiconductor 88PM8606 PMIC. |
| @@ -69,8 +69,8 @@ config LEDS_NET48XX | |||
| 69 | 69 | ||
| 70 | config LEDS_NET5501 | 70 | config LEDS_NET5501 |
| 71 | tristate "LED Support for Soekris net5501 series Error LED" | 71 | tristate "LED Support for Soekris net5501 series Error LED" |
| 72 | depends on LEDS_CLASS && LEDS_TRIGGERS | 72 | depends on LEDS_TRIGGERS |
| 73 | depends on LEDS_GPIO_PLATFORM && GPIO_CS5535 | 73 | depends on X86 && LEDS_GPIO_PLATFORM && GPIO_CS5535 |
| 74 | select LEDS_TRIGGER_DEFAULT_ON | 74 | select LEDS_TRIGGER_DEFAULT_ON |
| 75 | default n | 75 | default n |
| 76 | help | 76 | help |
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, | |||
| 250 | led.gpio = of_get_gpio_flags(child, 0, &flags); | 250 | led.gpio = of_get_gpio_flags(child, 0, &flags); |
| 251 | led.active_low = flags & OF_GPIO_ACTIVE_LOW; | 251 | led.active_low = flags & OF_GPIO_ACTIVE_LOW; |
| 252 | led.name = of_get_property(child, "label", NULL) ? : child->name; | 252 | led.name = of_get_property(child, "label", NULL) ? : child->name; |
| 253 | led.blinking = 0; | ||
| 254 | led.default_trigger = | 253 | led.default_trigger = |
| 255 | of_get_property(child, "linux,default-trigger", NULL); | 254 | of_get_property(child, "linux,default-trigger", NULL); |
| 256 | state = of_get_property(child, "default-state", NULL); | 255 | state = of_get_property(child, "default-state", NULL); |
