aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-03-25 15:36:05 +0000
committerJonas Gorski <jogo@openwrt.org>2015-03-25 15:36:05 +0000
commit0e4c1ba284d3b387b007d53f6ec2aeec3363b8df (patch)
tree9ee6f64dcc43bbfcb9f3c45b729c5eeb461ee575 /target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
parent582dfc52f592b24669c61bfc57ad75b7370c833b (diff)
downloadupstream-0e4c1ba284d3b387b007d53f6ec2aeec3363b8df.tar.gz
upstream-0e4c1ba284d3b387b007d53f6ec2aeec3363b8df.tar.bz2
upstream-0e4c1ba284d3b387b007d53f6ec2aeec3363b8df.zip
brcm63xx: move MAGIC to dts
Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 44991
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
index e33c7232a1..fd5b3244ad 100644
--- a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
+++ b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
@@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1814,6 +1814,43 @@ static struct board_info __initdata boar
+@@ -1776,6 +1776,43 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
@@ -50,7 +50,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
#endif /* CONFIG_BCM63XX_CPU_6362 */
/*
-@@ -1979,6 +2016,7 @@ static const struct board_info __initcon
+@@ -1941,6 +1978,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
@@ -58,7 +58,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
-@@ -2056,6 +2094,7 @@ static struct of_device_id const bcm963x
+@@ -2019,6 +2057,7 @@ static struct of_device_id const bcm963x
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6362