brcm63xx: fix up borked patch

Fix up patch borked by quilt fuzzy application of patches.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41294 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
index 6d3072d..28a0be9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
+++ b/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
@@ -54,14 +54,28 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1621,6 +1633,12 @@ static struct board_info __initdata boar
+@@ -1621,6 +1633,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
+               .force_speed_100        = 1,
+               .force_duplex_full      = 1,
+       },
+@@ -1642,6 +1656,8 @@ static struct board_info __initdata boar
+               .use_internal_phy       = 1,
+       },
+       .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
+               .force_speed_100        = 1,
+               .force_duplex_full      = 1,
+       },
+@@ -1661,6 +1677,8 @@ static struct board_info __initdata boar
+               .use_internal_phy       = 1,
+       },
+       .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
                .force_speed_100        = 1,

diff --git a/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
index ee3cdec..447c17d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
+++ b/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
@@ -54,14 +54,28 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1623,6 +1635,12 @@ static struct board_info __initdata boar
+@@ -1623,6 +1635,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
+               .force_speed_100        = 1,
+               .force_duplex_full      = 1,
+       },
+@@ -1644,6 +1658,8 @@ static struct board_info __initdata boar
+               .use_internal_phy       = 1,
+       },
+       .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
+               .force_speed_100        = 1,
+               .force_duplex_full      = 1,
+       },
+@@ -1663,6 +1679,8 @@ static struct board_info __initdata boar
+               .use_internal_phy       = 1,
+       },
+       .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
                .force_speed_100        = 1,