diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-07-08 12:27:55 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-07-08 12:27:55 +0000 |
| commit | 8630d101b7db9c19b19c714bb3335042098ed2ee (patch) | |
| tree | ad1832c7312bc629fa5edc5d6448ab17c746ab90 /target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch | |
| parent | a6c4ef18b7de3d3840729abb2775e8dd5843be0d (diff) | |
| download | upstream-8630d101b7db9c19b19c714bb3335042098ed2ee.tar.gz upstream-8630d101b7db9c19b19c714bb3335042098ed2ee.tar.bz2 upstream-8630d101b7db9c19b19c714bb3335042098ed2ee.zip | |
brcm63xx: fixup patches borked by allowing too much fuzz
Move defines and board_info structs back to their proper locations so
(de-)selecting SOC support won't break the build.
Reported-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 41550
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch | 26 |
1 files changed, 13 insertions, 13 deletions
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 07c39b40c6..dcba2d0d76 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 @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -598,6 +598,8 @@ static struct board_info __initdata boar +@@ -615,6 +615,8 @@ static struct board_info __initdata boar .has_uart0 = 1, .has_enet0 = 1, .enet0 = { @@ -9,7 +9,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -641,6 +643,8 @@ static struct board_info __initdata boar +@@ -658,6 +660,8 @@ static struct board_info __initdata boar .has_uart0 = 1, .has_enet0 = 1, .enet0 = { @@ -18,7 +18,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -926,6 +930,8 @@ static struct board_info __initdata boar +@@ -943,6 +947,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -27,7 +27,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -998,6 +1004,8 @@ static struct board_info __initdata boar +@@ -1015,6 +1021,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -36,7 +36,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -1245,6 +1253,8 @@ static struct board_info __initdata boar +@@ -1244,6 +1252,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -45,7 +45,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -1420,6 +1430,8 @@ static struct board_info __initdata boar +@@ -1419,6 +1429,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -54,7 +54,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -1610,6 +1622,8 @@ static struct board_info __initdata boar +@@ -1609,6 +1621,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -63,7 +63,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -1631,6 +1645,8 @@ static struct board_info __initdata boar +@@ -1630,6 +1644,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -72,7 +72,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -1650,6 +1666,8 @@ static struct board_info __initdata boar +@@ -1649,6 +1665,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -81,7 +81,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2021,6 +2039,8 @@ static struct board_info __initdata boar +@@ -2020,6 +2038,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -90,7 +90,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2073,6 +2093,8 @@ static struct board_info __initdata boar +@@ -2072,6 +2092,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -99,7 +99,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2214,6 +2236,8 @@ static struct board_info __initdata boar +@@ -2213,6 +2235,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -108,7 +108,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2331,6 +2355,8 @@ static struct board_info __initdata boar +@@ -2330,6 +2354,8 @@ static struct board_info __initdata boar }, .enet1 = { |