generic: rtl8366: make rtl8366_set_vlan static

[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 2288baa..da2c378 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,54 +1,46 @@
 --- 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
+@@ -331,29 +331,28 @@ static struct board_info __initdata boar
+ 
+       .leds = {
+               {
+-                      .name           = "adsl-fail",
+-                      .gpio           = 2,
++                      .name           = "line1",
++                      .gpio           = 4,
                        .active_low     = 1,
                },
                {
 -                      .name           = "ppp",
 -                      .gpio           = 3,
-+                      .name           = "power",
-+                      .gpio           = 0,
++                      .name           = "line2",
++                      .gpio           = 5,
                        .active_low     = 1,
-+                      .default_trigger = "default-on",
                },
                {
 -                      .name           = "ppp-fail",
-+                      .name           = "stop",
-+                      .gpio           = 1,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "line1",
-                       .gpio           = 4,
+-                      .gpio           = 4,
++                      .name           = "line3",
++                      .gpio           = 6,
                        .active_low     = 1,
                },
                {
 -                      .name           = "power",
 -                      .gpio           = 0,
-+                      .name           = "line2",
-+                      .gpio           = 5,
++                      .name           = "tel",
++                      .gpio           = 7,
                        .active_low     = 1,
 -                      .default_trigger = "default-on",
                },
                {
 -                      .name           = "stop",
 -                      .gpio           = 1,
-+                      .name           = "line3",
-+                      .gpio           = 6,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "tel",
-+                      .gpio           = 7,
-+                      .active_low     = 1,
-+              },
-+              {
 +                      .name           = "eth",
 +                      .gpio           = 35,
                        .active_low     = 1,
                },
        },
-@@ -855,6 +870,7 @@ static struct platform_device bcm63xx_gp
+@@ -855,6 +854,7 @@ static struct platform_device bcm63xx_gp
  int __init board_register_devices(void)
  {
        u32 val;
@@ -56,7 +48,7 @@
        int button_count = 0;
  
        if (board.has_pccard)
-@@ -902,7 +918,11 @@ int __init board_register_devices(void)
+@@ -902,7 +902,11 @@ int __init board_register_devices(void)
  
        platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
  
@@ -69,14 +61,3 @@
        bcm63xx_led_data.leds = board.leds;
  
        platform_device_register(&bcm63xx_gpio_leds);
---- 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];
- 
-       /* Buttons */
-       struct gpio_button buttons[2];