aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/536-board_fast2704.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
commit5787156b55216dd241ead36f56f058ff77d92110 (patch)
treee88a8d6d871fd14530988418998e002f152bc427 /target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
parentbbf839a3e399e36a66ffab7a65797ba254b4ec1d (diff)
downloadmaster-187ad058-5787156b55216dd241ead36f56f058ff77d92110.tar.gz
master-187ad058-5787156b55216dd241ead36f56f058ff77d92110.tar.bz2
master-187ad058-5787156b55216dd241ead36f56f058ff77d92110.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41550 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
index cc7b71c54d..4fa9f90507 100644
--- a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
+++ b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
@@ -12,7 +12,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1469,6 +1469,122 @@ static struct board_info __initdata boar
+@@ -1468,6 +1468,122 @@ static struct board_info __initdata boar
},
};
@@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -3825,6 +3941,7 @@ static const struct board_info __initcon
+@@ -3824,6 +3940,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_963281T_TEF,
&board_dsl_274xb_f1,