summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.1/501-board-NB4.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/501-board-NB4.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-4.1/501-board-NB4.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.1/501-board-NB4.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-4.1/501-board-NB4.patch b/target/linux/brcm63xx/patches-4.1/501-board-NB4.patch
index 97a9c73f85..79d638eb86 100644
--- a/target/linux/brcm63xx/patches-4.1/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-4.1/501-board-NB4.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -693,6 +693,62 @@ static struct board_info __initdata boar
+@@ -719,6 +719,62 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@@ -63,7 +63,7 @@
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
-@@ -729,6 +785,8 @@ static const struct board_info __initcon
+@@ -755,6 +811,8 @@ static const struct board_info __initcon
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
@@ -72,7 +72,7 @@
#endif
};
-@@ -770,6 +828,8 @@ static struct of_device_id const bcm963x
+@@ -796,6 +854,8 @@ static struct of_device_id const bcm963x
{ .compatible = "pirelli,a226m", .data = &board_DWVS0, },
{ .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, },
{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },