aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-07-08 12:27:55 +0000
committerJonas Gorski <jogo@openwrt.org>2014-07-08 12:27:55 +0000
commit5787156b55216dd241ead36f56f058ff77d92110 (patch)
treee88a8d6d871fd14530988418998e002f152bc427 /target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
parentbbf839a3e399e36a66ffab7a65797ba254b4ec1d (diff)
downloadupstream-5787156b55216dd241ead36f56f058ff77d92110.tar.gz
upstream-5787156b55216dd241ead36f56f058ff77d92110.tar.bz2
upstream-5787156b55216dd241ead36f56f058ff77d92110.zip
brcm63xx: fixup patches borked by allowing too much fuzz
Move defines and board_info structs back to their proper locations so (de-)selecting SOC support won't break the build. Reported-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41550 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/534-board_hw556.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/534-board_hw556.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
index baf0266afb..ab15a1cf35 100644
--- a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
@@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -2893,6 +2894,492 @@ static struct board_info __initdata boar
+@@ -2882,6 +2883,492 @@ static struct board_info __initdata boar
},
};
@@ -501,7 +501,7 @@
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -3332,6 +3819,10 @@ static const struct board_info __initcon
+@@ -3321,6 +3808,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2,
&board_ct6373_1,
&board_HW553,
@@ -512,7 +512,7 @@
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -3351,13 +3842,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3340,13 +3831,37 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name();