target/linux: refresh 2.6.32 patches

[openwrt/openwrt.git] / target / linux / brcm63xx / patches-2.6.32 / 140-new_bcm96348gw_leds.patch

diff --git a/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch b/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
index 6924b141bcf3a857bb5e9d59abe123af5a1dbc45..2288baafa65030d3201e12dfc53c5448f0e71ad0 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
-===================================================================
---- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c      2010-02-28 18:50:37.000000000 +0100
-+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c   2010-02-28 18:54:31.000000000 +0100
-@@ -336,24 +336,39 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -336,24 +336,39 @@ static struct board_info __initdata boar
                        .active_low     = 1,
                },
                {
@@ -50,15 +48,15 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
                        .active_low     = 1,
                },
        },
-@@ -855,6 +870,7 @@
+@@ -855,6 +870,7 @@ static struct platform_device bcm63xx_gp
  int __init board_register_devices(void)
  {
        u32 val;
 +      int led_count = 0;
+       int button_count = 0;
  
        if (board.has_pccard)
-               bcm63xx_pcmcia_register();
-@@ -901,7 +917,11 @@
+@@ -902,7 +918,11 @@ int __init board_register_devices(void)
  
        platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
  
@@ -71,16 +69,14 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
        bcm63xx_led_data.leds = board.leds;
  
        platform_device_register(&bcm63xx_gpio_leds);
-Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-===================================================================
---- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h    2010-02-28 18:54:39.000000000 +0100
-+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 18:54:49.000000000 +0100
-@@ -54,7 +54,7 @@
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -54,7 +54,7 @@ struct board_info {
        struct bcm63xx_dsp_platform_data dsp;
  
        /* GPIO LEDs */
 -      struct gpio_led leds[5];
 +      struct gpio_led leds[8];
  
-       /* Reset button */
-       struct gpio_button reset_buttons[1];
+       /* Buttons */
+       struct gpio_button buttons[2];