brcm63xx: fix up borked patch
authorJonas Gorski <jogo@openwrt.org>
Sat, 21 Jun 2014 19:23:18 +0000 (19:23 +0000)
committerJonas Gorski <jogo@openwrt.org>
Sat, 21 Jun 2014 19:23:18 +0000 (19:23 +0000)
Fix up patch borked by quilt fuzzy application of patches.

SVN-Revision: 41294

target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch

index 6d3072deefcf42ab67216f6e215a00862da2d10a..28a0be9d84334ec08a4dbec914b7de62bd2a1a12 100644 (file)
                .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,
index ee3cdec1f39233aa2b24051c79404ad16a864e82..447c17df18ae001167392571c8aaf962a795fbb3 100644 (file)
                .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,