From e7583a35c1b6d71d4586a4ad4b9824a86b25e41b Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Tue, 31 May 2011 16:23:43 +0800
Subject: [PATCH] --- yaml --- r: 256671 b: refs/heads/master c:
 2bcc7ed5b83b0a59c6976476e8788675038fb11b h: refs/heads/master i:   256669:
 65ce407c673198af4991164b716e219543e1369f   256667:
 8bd4d9bc6b4f4456df429ef24ed393b54909d2f4   256663:
 f5973bd817c1ad14e40a76e51e1f0ee0e48e0bdb   256655:
 e6de306d178b41acf017c1fa60d27b96f02b5e0a   256639:
 0990ec41b530aca799b18d9cb114417c04d3a596 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/leds/Kconfig     | 19 +------------------
 trunk/drivers/leds/leds-gpio.c |  6 +++---
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index c2eb37565964..951ba41ec062 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3cc68c37897f0656489a0d853d6e342fc6f076b
+refs/heads/master: 2bcc7ed5b83b0a59c6976476e8788675038fb11b
diff --git a/trunk/drivers/leds/Kconfig b/trunk/drivers/leds/Kconfig
index 23f0d5e99f35..9d7d9400bbf5 100644
--- a/trunk/drivers/leds/Kconfig
+++ b/trunk/drivers/leds/Kconfig
@@ -93,7 +93,7 @@ config LEDS_NET48XX
 config LEDS_NET5501
 	tristate "LED Support for Soekris net5501 series Error LED"
 	depends on LEDS_TRIGGERS
-	depends on X86 && LEDS_GPIO_PLATFORM && GPIO_CS5535
+	depends on X86 && GPIO_CS5535
 	select LEDS_TRIGGER_DEFAULT_ON
 	default n
 	help
@@ -183,23 +183,6 @@ config LEDS_GPIO
 	  defined as platform devices and/or OpenFirmware platform devices.
 	  The code to use these bindings can be selected below.
 
-config LEDS_GPIO_PLATFORM
-	bool "Platform device bindings for GPIO LEDs"
-	depends on LEDS_GPIO
-	default y
-	help
-	  Let the leds-gpio driver drive LEDs which have been defined as
-	  platform devices.  If you don't know what this means, say yes.
-
-config LEDS_GPIO_OF
-	bool "OpenFirmware platform device bindings for GPIO LEDs"
-	depends on LEDS_GPIO && OF_DEVICE
-	default y
-	help
-	  Let the leds-gpio driver drive LEDs which have been defined as
-	  of_platform devices.  For instance, LEDs which are listed in a "dts"
-	  file.
-
 config LEDS_LP3944
 	tristate "LED Support for N.S. LP3944 (Fun Light) I2C chip"
 	depends on LEDS_CLASS
diff --git a/trunk/drivers/leds/leds-gpio.c b/trunk/drivers/leds/leds-gpio.c
index b0480c8fbcbf..3d8bc327a68d 100644
--- a/trunk/drivers/leds/leds-gpio.c
+++ b/trunk/drivers/leds/leds-gpio.c
@@ -165,7 +165,7 @@ static inline int sizeof_gpio_leds_priv(int num_leds)
 }
 
 /* Code to create from OpenFirmware platform devices */
-#ifdef CONFIG_LEDS_GPIO_OF
+#ifdef CONFIG_OF_GPIO
 static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node, *child;
@@ -223,13 +223,13 @@ static const struct of_device_id of_gpio_leds_match[] = {
 	{ .compatible = "gpio-leds", },
 	{},
 };
-#else
+#else /* CONFIG_OF_GPIO */
 static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_device *pdev)
 {
 	return NULL;
 }
 #define of_gpio_leds_match NULL
-#endif
+#endif /* CONFIG_OF_GPIO */
 
 
 static int __devinit gpio_led_probe(struct platform_device *pdev)