From ef0e9c6e299dc2e5c6e1aa9f67fe222796803209 Mon Sep 17 00:00:00 2001 From: jogo Date: Sat, 21 Jun 2014 19:23:18 +0000 Subject: [PATCH] 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 --- .../brcm63xx/patches-3.10/553-boards_probe_switch.patch | 16 +++++++++++++++- .../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, -- 2.11.0