From 8630d101b7db9c19b19c714bb3335042098ed2ee Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Tue, 8 Jul 2014 12:27:55 +0000 Subject: brcm63xx: fixup patches borked by allowing too much fuzz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jonas Gorski SVN-Revision: 41550 --- target/linux/brcm63xx/patches-3.10/534-board_hw556.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/brcm63xx/patches-3.10/534-board_hw556.patch') 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 #include #include -@@ -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(); -- cgit v1.2.3