aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-06-21 19:23:38 +0000
committerJonas Gorski <jogo@openwrt.org>2014-06-21 19:23:38 +0000
commit43cc8c3ebec4658963d44a6108f8f74e8ccdbb54 (patch)
tree5e1eda807e353fc17f5fa4da15611b58d7524833 /target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
parent21d65bb185225a3a5369756fc44acbbbfbc2f651 (diff)
downloadupstream-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.tar.gz
upstream-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.tar.bz2
upstream-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.zip
brcm63xx: allow bcm963xx and livebox support at the same time
Use the CFE_EPTSEAL to tell them apart at runtime. Added for now only for the 3.14 until properly tested. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 41296
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.patch4
1 files changed, 2 insertions, 2 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 6f6420031d..821a185793 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
-@@ -3797,6 +3797,96 @@ static struct board_info __initdata boar
+@@ -3784,6 +3784,96 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
@@ -103,7 +103,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
#endif
/*
-@@ -4018,6 +4108,7 @@ static const struct board_info __initcon
+@@ -4005,6 +4095,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,