summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-06-30 13:34:37 +0000
committerJonas Gorski <jogo@openwrt.org>2014-06-30 13:34:37 +0000
commitdc230d9b0f9ba046fb1e9e51de21ae35504a9aab (patch)
tree8d43a35b2fbe9a47e9c75f708017d651d47d4fa1 /target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
parent44ef9f778994e1b9bd37c8525045b53d82b6a504 (diff)
downloadmaster-31e0f0ae-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.tar.gz
master-31e0f0ae-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.tar.bz2
master-31e0f0ae-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.zip
brcm63xx: 3.10: backport multi-board support
There have been no reported regressions, so backport it to 3.10. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 41422
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
index 251d1387f1..c340429ede 100644
--- a/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4427,6 +4427,75 @@ static struct board_info __initdata boar
+@@ -4424,6 +4424,75 @@ static struct board_info __initdata boar
#endif
/*
@@ -76,7 +76,7 @@
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4511,6 +4580,9 @@ static const struct board_info __initcon
+@@ -4508,6 +4577,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
@@ -85,4 +85,4 @@
+#endif
};
- /*
+ static void __init boardid_fixup(u8 *boot_addr)