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 | 5787156b55216dd241ead36f56f058ff77d92110 (patch) | |
| tree | e88a8d6d871fd14530988418998e002f152bc427 /target/linux/brcm63xx/patches-3.14/528-board_nb6.patch | |
| parent | bbf839a3e399e36a66ffab7a65797ba254b4ec1d (diff) | |
| download | upstream-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.14/528-board_nb6.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.14/528-board_nb6.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch index 67d95f906f..31d7eddc6d 100644 --- a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch @@ -8,7 +8,7 @@ #include <asm/addrspace.h> #include <bcm63xx_board.h> #include <bcm63xx_cpu.h> -@@ -634,6 +635,8 @@ static struct board_info __initdata boar +@@ -46,6 +47,8 @@ #define NB4_SPI_GPIO_MOSI 7 #define NB4_SPI_GPIO_CLK 6 #define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X)) @@ -17,7 +17,7 @@ #define CT6373_PID_OFFSET 0xff80 #define CT6373_74X164_GPIO_BASE 64 -@@ -2664,6 +2667,104 @@ static struct board_info __initdata boar +@@ -2663,6 +2666,104 @@ static struct board_info __initdata boar }; #endif @@ -122,7 +122,7 @@ /* * known 6368 boards */ -@@ -2870,6 +2971,10 @@ static const struct board_info __initcon +@@ -2869,6 +2970,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -133,7 +133,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -2891,6 +2996,11 @@ static void __init boardid_fixup(u8 *boo +@@ -2890,6 +2995,11 @@ static void __init boardid_fixup(u8 *boo } } |