diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-06-21 19:23:18 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-06-21 19:23:18 +0000 |
| commit | f695fa358aafe1a96825977dd7d598354b1828f6 (patch) | |
| tree | 528b8055bdd16282c0badbac1cdb53d64a7958cc | |
| parent | e1de4e27c12e352e6932f8001803373e00c0e18f (diff) | |
| download | upstream-f695fa358aafe1a96825977dd7d598354b1828f6.tar.gz upstream-f695fa358aafe1a96825977dd7d598354b1828f6.tar.bz2 upstream-f695fa358aafe1a96825977dd7d598354b1828f6.zip | |
brcm63xx: fix up borked patch
Fix up patch borked by quilt fuzzy application of patches.
SVN-Revision: 41294
| -rw-r--r-- | target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch | 16 | ||||
| -rw-r--r-- | target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch | 16 |
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, |