aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.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/507-board-MAGIC.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/507-board-MAGIC.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch
index 465f3d3eb6..4e9d12a0f7 100644
--- a/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -816,6 +816,78 @@ static struct board_info __initdata boar
+@@ -802,6 +802,78 @@ static struct board_info __initdata boar
},
},
};
@@ -79,7 +79,7 @@
#endif
/*
-@@ -1745,6 +1817,7 @@ static const struct board_info __initcon
+@@ -1731,6 +1803,7 @@ static const struct board_info __initcon
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,