aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-07-08 12:27:55 +0000
committerJonas Gorski <jogo@openwrt.org>2014-07-08 12:27:55 +0000
commit8630d101b7db9c19b19c714bb3335042098ed2ee (patch)
treead1832c7312bc629fa5edc5d6448ab17c746ab90 /target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
parenta6c4ef18b7de3d3840729abb2775e8dd5843be0d (diff)
downloadupstream-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/529-board_fast2604.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
index 9d27f44c87..83eb1d536d 100644
--- a/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1054,6 +1054,57 @@ static struct board_info __initdata boar
+@@ -1053,6 +1053,57 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
@@ -58,7 +58,7 @@
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -2939,6 +2990,7 @@ static const struct board_info __initcon
+@@ -2938,6 +2989,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,