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

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index f98d17a..81bf25e 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -21,7 +21,7 @@ comment "LED drivers"
 
 config LEDS_88PM860X
        tristate "LED Support for Marvell 88PM860x PMIC"
-       depends on LEDS_CLASS && MFD_88PM860X
+       depends on MFD_88PM860X
        help
          This option enables support for on-chip LED drivers found on Marvell
          Semiconductor 88PM8606 PMIC.
@@ -69,8 +69,8 @@ config LEDS_NET48XX
 
 config LEDS_NET5501
        tristate "LED Support for Soekris net5501 series Error LED"
-       depends on LEDS_CLASS && LEDS_TRIGGERS
-       depends on LEDS_GPIO_PLATFORM && GPIO_CS5535
+       depends on LEDS_TRIGGERS
+       depends on X86 && LEDS_GPIO_PLATFORM && GPIO_CS5535
        select LEDS_TRIGGER_DEFAULT_ON
        default n
        help

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 26843dd..cc22eee 100644 (file)
--- 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);