diff options
author | Jonas Gorski <jogo@openwrt.org> | 2014-07-08 12:27:55 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2014-07-08 12:27:55 +0000 |
commit | 8630d101b7db9c19b19c714bb3335042098ed2ee (patch) | |
tree | ad1832c7312bc629fa5edc5d6448ab17c746ab90 /target/linux/brcm63xx/patches-3.14/534-board_hw556.patch | |
parent | a6c4ef18b7de3d3840729abb2775e8dd5843be0d (diff) | |
download | upstream-8630d101b7db9c19b19c714bb3335042098ed2ee.tar.gz upstream-8630d101b7db9c19b19c714bb3335042098ed2ee.tar.bz2 upstream-8630d101b7db9c19b19c714bb3335042098ed2ee.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>
SVN-Revision: 41550
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/534-board_hw556.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.14/534-board_hw556.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch index 8ebe39bef9..fa8465763f 100644 --- a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch +++ b/target/linux/brcm63xx/patches-3.14/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 +@@ -2892,6 +2893,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 +@@ -3331,6 +3818,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 +@@ -3350,13 +3841,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(); |