aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-30 23:26:02 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-30 23:26:02 +0000
commit3a9e4ba8960ae2bfa327f1a4911b104b6cbb523e (patch)
tree2e7fde0e36b4cf3d2b7b2f4b41cafd8c99d83fc2 /target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch
parent206f1db59ed21e42e4a80991d9ef77918f8fbb92 (diff)
downloadupstream-3a9e4ba8960ae2bfa327f1a4911b104b6cbb523e.tar.gz
upstream-3a9e4ba8960ae2bfa327f1a4911b104b6cbb523e.tar.bz2
upstream-3a9e4ba8960ae2bfa327f1a4911b104b6cbb523e.zip
brcm63xx: unbreak board_probe_switch again
Also move it to an earlier place so new boards added are less likely to confuse quilt. Fixes #19965. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46148
Diffstat (limited to 'target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch
index 1d513ab3e4..cc4f6c2f74 100644
--- a/target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -653,6 +653,40 @@ static struct board_info __initdata boar
+@@ -671,6 +671,40 @@ static struct board_info __initdata boar
.num_board_fixups = ARRAY_SIZE(spw500v_fixups),
},
};
@@ -41,7 +41,7 @@
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
-@@ -932,6 +966,7 @@ static const struct board_info __initcon
+@@ -958,6 +992,7 @@ static const struct board_info __initcon
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,
@@ -49,7 +49,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -976,6 +1011,7 @@ static struct of_device_id const bcm963x
+@@ -1002,6 +1037,7 @@ static struct of_device_id const bcm963x
{ .compatible = "t-com,spw500v", .data = &board_spw500v, },
{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
{ .compatible = "tecom,gw6200", .data = &board_gw6200, },