generic: rtl8366: make rtl8366_set_vlan static

[openwrt.git] / target / linux / brcm63xx / patches-2.6.32 / 221-board-NB4.patch

diff --git a/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch b/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
index 7c17b88..38ab54c 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
@@ -21,7 +21,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;

-@@ -713,6 +720,471 @@ static struct board_info __initdata boar
+@@ -727,6 +734,471 @@ static struct board_info __initdata boar

  
        .has_ohci0 = 1,
  };
  
        .has_ohci0 = 1,
  };


@@ -493,7 +493,7 @@
  #endif
  
  /*
  #endif
  
  /*

-@@ -743,9 +1215,30 @@ static const struct board_info __initdat
+@@ -757,9 +1229,30 @@ static const struct board_info __initdat

        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,


@@ -524,7 +524,7 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
  /*
   * early init callback, read nvram data from flash and checksum it
   */

-@@ -793,6 +1286,9 @@ void __init board_prom_init(void)
+@@ -807,6 +1300,9 @@ void __init board_prom_init(void)

                return;
        }
  
                return;
        }
  


@@ -534,14 +534,3 @@
        /* find board by name */
        for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
                if (strncmp(nvram.name, bcm963xx_boards[i]->name,
        /* find board by name */
        for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
                if (strncmp(nvram.name, bcm963xx_boards[i]->name,

---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -55,7 +55,7 @@ struct board_info {
-       struct bcm63xx_dsp_platform_data dsp;
- 
-       /* GPIO LEDs */
--      struct gpio_led leds[8];
-+      struct gpio_led leds[9];
- 
-       /* Buttons */
-       struct gpio_button buttons[2];