fix board patches so that new boards are withing appropriate ifdef

[openwrt/staging/mkresin.git] / target / linux / brcm63xx / patches-3.3 / 507-board-MAGIC.patch

diff --git a/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
index 274afe12a4ade383e2631dfbdc60f5e239bc47bb..63d9e14d7ef34347c2df2b07796f68a7bcf4b8ab 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
@@ -1,12 +1,13 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -250,6 +250,76 @@ static struct board_info __initdata boar
+@@ -724,6 +724,76 @@ static struct board_info __initdata boar
+               },
        },
  };
- 
++
 +static struct board_info __initdata board_96348sv = {
 +      .name                           = "MAGIC",
-+      .expected_cpu_id        = 0x6348,
++      .expected_cpu_id                = 0x6348,
 +
 +      .has_uart0                      = 1,
 +      .has_enet0                      = 1,
@@ -14,11 +15,11 @@
 +      .has_pci                        = 1,
 +
 +      .enet0 = {
-+              .has_phy                        = 1,
++              .has_phy                = 1,
 +              .use_internal_phy       = 1,
 +      },
 +      .enet1 = {
-+              /* is has BP_ENET_EXTERNAL_PHY */
++              /* it has BP_ENET_EXTERNAL_PHY */
 +              .force_speed_100        = 1,
 +              .force_duplex_full      = 1,
 +      },
@@ -31,7 +32,7 @@
 +      .dsp = {
 +              .gpio_rst               = 25,
 +              .gpio_int               = 34,
-+              .cs                             = 2,
++              .cs                     = 2,
 +              .ext_irq                = 2,
 +      },
 +
@@ -73,11 +74,10 @@
 +              },
 +      },
 +};
-+
  #endif
  
  /*
-@@ -1536,6 +1606,7 @@ static const struct board_info __initdat
+@@ -1535,6 +1605,7 @@ static const struct board_info __initdat
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_spw500v,