summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.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-3.18/537-board_fast2504n.patch
parent206f1db59ed21e42e4a80991d9ef77918f8fbb92 (diff)
downloadmaster-31e0f0ae-3a9e4ba8960ae2bfa327f1a4911b104b6cbb523e.tar.gz
master-31e0f0ae-3a9e4ba8960ae2bfa327f1a4911b104b6cbb523e.tar.bz2
master-31e0f0ae-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-3.18/537-board_fast2504n.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch
index 1d70064202..b423df3bb1 100644
--- a/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch
+++ b/target/linux/brcm63xx/patches-3.18/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
-@@ -1710,6 +1710,43 @@ static struct board_info __initdata boar
+@@ -1736,6 +1736,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 */
/*
-@@ -1875,6 +1912,7 @@ static const struct board_info __initcon
+@@ -1901,6 +1938,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
-@@ -1956,6 +1994,7 @@ static struct of_device_id const bcm963x
+@@ -1982,6 +2020,7 @@ static struct of_device_id const bcm963x
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6362