aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2014-01-16 00:45:19 +0000
committerFlorian Fainelli <florian@openwrt.org>2014-01-16 00:45:19 +0000
commit07eb492643762a6174e37dee904b6b6c18292d58 (patch)
tree63aea64aba2f266bae44d1fe1355a28d511cf482 /target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
parentac3caf5ea4e7a76c0b01a78b17b90e3cc7db56d6 (diff)
downloadupstream-07eb492643762a6174e37dee904b6b6c18292d58.tar.gz
upstream-07eb492643762a6174e37dee904b6b6c18292d58.tar.bz2
upstream-07eb492643762a6174e37dee904b6b6c18292d58.zip
brcm63xx: do not add twice the same field to board
Changeset r39302 updated a board section and added twice .has_ehci0, this is not necessary, so fix it. Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39304 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/528-board_nb6.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/528-board_nb6.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
index 62219fc3bd..6b6d00de88 100644
--- a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
@@ -17,7 +17,7 @@
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
-@@ -2666,6 +2669,103 @@ static struct board_info __initdata boar
+@@ -2665,6 +2668,103 @@ static struct board_info __initdata boar
};
#endif
@@ -121,7 +121,7 @@
/*
* known 6368 boards
*/
-@@ -2872,6 +2972,10 @@ static const struct board_info __initcon
+@@ -2871,6 +2971,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
@@ -132,7 +132,7 @@
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -2939,6 +3043,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2938,6 +3042,11 @@ static void __init boardid_fixup(u8 *boo
}
}