aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-06-21 19:23:18 +0000
committerJonas Gorski <jogo@openwrt.org>2014-06-21 19:23:18 +0000
commit920396728a20e3d051d503e07751d632343d5e80 (patch)
tree29d41787449d5d0514811bc106caecc20d7ed88c /target/linux
parent8c3e3b42e925f8c843c228bb5d3123cb19741eb6 (diff)
downloadupstream-920396728a20e3d051d503e07751d632343d5e80.tar.gz
upstream-920396728a20e3d051d503e07751d632343d5e80.tar.bz2
upstream-920396728a20e3d051d503e07751d632343d5e80.zip
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
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch16
-rw-r--r--target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch16
2 files changed, 30 insertions, 2 deletions
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 6d3072deef..28a0be9d84 100644
--- 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 ee3cdec1f3..447c17df18 100644
--- 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,