aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.1/516-board_96348A-122.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
commit2f38afae4e7bc15571913d499f51929a122c360f (patch)
tree2507e12d665b44866013f30f69aca9a2a9008659 /target/linux/brcm63xx/patches-4.1/516-board_96348A-122.patch
parentd75bcd95a63c5f8d8a478a23a122a586342090e3 (diff)
downloadmaster-187ad058-2f38afae4e7bc15571913d499f51929a122c360f.tar.gz
master-187ad058-2f38afae4e7bc15571913d499f51929a122c360f.tar.bz2
master-187ad058-2f38afae4e7bc15571913d499f51929a122c360f.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46148 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-4.1/516-board_96348A-122.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.1/516-board_96348A-122.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-4.1/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-4.1/516-board_96348A-122.patch
index 3d68881c83..0df9bbb96f 100644
--- a/target/linux/brcm63xx/patches-4.1/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-4.1/516-board_96348A-122.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -454,6 +454,31 @@ static struct board_info __initdata boar
+@@ -462,6 +462,31 @@ static struct board_info __initdata boar
},
};
@@ -32,7 +32,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -1100,6 +1125,7 @@ static const struct board_info __initcon
+@@ -1126,6 +1151,7 @@ static const struct board_info __initcon
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,
@@ -40,7 +40,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1142,6 +1168,7 @@ static struct of_device_id const bcm963x
+@@ -1168,6 +1194,7 @@ static struct of_device_id const bcm963x
{ .compatible = "bt,v2110", .data = &board_V2110, },
{ .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },
{ .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, },