From: Daniel Dickinson <crazycshore@gmail.com>
Date: Tue, 7 Dec 2010 17:32:29 +0000 (+0000)
Subject: patches: Renamed 150-led_count to 141-led_count so it comes before the 15-alice_gate2... 
X-Git-Tag: reboot~18183
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f8ed133c0a816ace12bdd11cb3eb3fed168f1186;p=openwrt%2Fstaging%2Fxback.git

patches: Renamed 150-led_count to 141-led_count so it comes before the 15-alice_gate2_leds.patch as which led count was mistakenly given the same number.

SVN-Revision: 24310
---

diff --git a/target/linux/brcm63xx/patches-2.6.35/141-led_count.patch b/target/linux/brcm63xx/patches-2.6.35/141-led_count.patch
new file mode 100644
index 0000000000..baf092053d
--- /dev/null
+++ b/target/linux/brcm63xx/patches-2.6.35/141-led_count.patch
@@ -0,0 +1,23 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -881,6 +881,7 @@ int __init board_register_devices(void)
+ {
+ 	u32 val;
+ 	int button_count = 0;
++	int led_count = 0;
+ 
+ 	if (board.has_uart0)
+ 		bcm63xx_uart_register(0);
+@@ -922,7 +923,11 @@ int __init board_register_devices(void)
+ 
+ 	platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
+ 
+-	bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
++	/* count number of LEDs defined by this device */
++	while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
++	  led_count++;
++
++	bcm63xx_led_data.num_leds = led_count;
+ 	bcm63xx_led_data.leds = board.leds;
+ 
+ 	platform_device_register(&bcm63xx_gpio_leds);
diff --git a/target/linux/brcm63xx/patches-2.6.35/150-led_count b/target/linux/brcm63xx/patches-2.6.35/150-led_count
deleted file mode 100644
index baf092053d..0000000000
--- a/target/linux/brcm63xx/patches-2.6.35/150-led_count
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -881,6 +881,7 @@ int __init board_register_devices(void)
- {
- 	u32 val;
- 	int button_count = 0;
-+	int led_count = 0;
- 
- 	if (board.has_uart0)
- 		bcm63xx_uart_register(0);
-@@ -922,7 +923,11 @@ int __init board_register_devices(void)
- 
- 	platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
- 
--	bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
-+	/* count number of LEDs defined by this device */
-+	while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
-+	  led_count++;
-+
-+	bcm63xx_led_data.num_leds = led_count;
- 	bcm63xx_led_data.leds = board.leds;
- 
- 	platform_device_register(&bcm63xx_gpio_leds);