[brcm63xx] move board_HW553 inside the ifdef ..BCM6358 .. endif block

SVN-Revision: 27484

diff --git a/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch b/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch
index e9ac36600ddb80954a836f7238234aa03d6c8ce6..964f46c767f5d85a20dd4a3186abae087a6a692b 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/449-board_hw553.patch
@@ -1,9 +1,10 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1706,6 +1706,81 @@ static struct board_info __initdata boar
+@@ -1704,6 +1704,81 @@ static struct board_info __initdata boar
+       .spis = nb4_spi_devices,
+       .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
- #endif
- 
++
 +static struct board_info __initdata board_HW553 = {
 +      .name                           = "HW553",
 +      .expected_cpu_id                = 0x6358,
@@ -78,10 +79,9 @@
 +              },
 +      },
 +};
-+
+ #endif
+ 
  /*
-  * all boards
-  */
 @@ -1746,6 +1821,7 @@ static const struct board_info __initdat
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,

diff --git a/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch b/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch
index 7a5f2feb5148e526437a818b0cf0f3a7bce597ee..db8d35296028c4309e99415278fd85717227afa6 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/451-board_spw303v.patch
@@ -1,8 +1,8 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1741,6 +1741,72 @@ static struct board_info __initdata boar
-       .spis = nb4_spi_devices,
-       .num_spis = ARRAY_SIZE(nb4_spi_devices),
+@@ -1816,6 +1816,72 @@ static struct board_info __initdata boar
+               },
+       },
  };
 +
 + /* T-Home Speedport W 303V Typ B */
@@ -72,7 +72,7 @@
 +};
  #endif
  
- static struct board_info __initdata board_HW553 = {
+ /*
 @@ -1860,6 +1926,7 @@ static const struct board_info __initdat
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,

diff --git a/target/linux/brcm63xx/patches-3.0/449-board_hw553.patch b/target/linux/brcm63xx/patches-3.0/449-board_hw553.patch
index e9ac36600ddb80954a836f7238234aa03d6c8ce6..964f46c767f5d85a20dd4a3186abae087a6a692b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.0/449-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.0/449-board_hw553.patch
@@ -1,9 +1,10 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1706,6 +1706,81 @@ static struct board_info __initdata boar
+@@ -1704,6 +1704,81 @@ static struct board_info __initdata boar
+       .spis = nb4_spi_devices,
+       .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
- #endif
- 
++
 +static struct board_info __initdata board_HW553 = {
 +      .name                           = "HW553",
 +      .expected_cpu_id                = 0x6358,
@@ -78,10 +79,9 @@
 +              },
 +      },
 +};
-+
+ #endif
+ 
  /*
-  * all boards
-  */
 @@ -1746,6 +1821,7 @@ static const struct board_info __initdat
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,

diff --git a/target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch b/target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch
index 7a5f2feb5148e526437a818b0cf0f3a7bce597ee..db8d35296028c4309e99415278fd85717227afa6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch
@@ -1,8 +1,8 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1741,6 +1741,72 @@ static struct board_info __initdata boar
-       .spis = nb4_spi_devices,
-       .num_spis = ARRAY_SIZE(nb4_spi_devices),
+@@ -1816,6 +1816,72 @@ static struct board_info __initdata boar
+               },
+       },
  };
 +
 + /* T-Home Speedport W 303V Typ B */
@@ -72,7 +72,7 @@
 +};
  #endif
  
- static struct board_info __initdata board_HW553 = {
+ /*
 @@ -1860,6 +1926,7 @@ static const struct board_info __initdat
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,