aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.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
commite5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61 (patch)
tree4eef5783e11357f98df2083a49b4f240e8e3830c /target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch
parent7c76e870395f36de61cadbd9ae4b0b7efc3dd4a7 (diff)
downloadmaster-187ad058-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.tar.gz
master-187ad058-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.tar.bz2
master-187ad058-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41422 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch
index b9b4a843e2..b1b49736b5 100644
--- a/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch
+++ b/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4475,6 +4475,131 @@ static struct board_info __initdata boar
+@@ -4472,6 +4472,131 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
@@ -132,7 +132,7 @@
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
-@@ -4729,6 +4854,7 @@ static const struct board_info __initcon
+@@ -4726,6 +4851,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268