Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d372e7fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 969ea5c5 5f8269da

drivers/leds/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -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

drivers/leds/leds-gpio.c

+0 −1
Original line number Diff line number Diff line
@@ -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);