aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-06-05 13:40:41 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-06-05 13:40:41 +0000
commit9a61b249c5a355ce95747200302e353a0d30bea0 (patch)
treeb778ea6d1bec2bd758297e0f879b5cb3bc0b4191 /target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
parent5ec22097344e7f57a1b0e9332dd87051627cea18 (diff)
downloadupstream-9a61b249c5a355ce95747200302e353a0d30bea0.tar.gz
upstream-9a61b249c5a355ce95747200302e353a0d30bea0.tar.bz2
upstream-9a61b249c5a355ce95747200302e353a0d30bea0.zip
fix board patches so that new boards are withing appropriate ifdef
Some new board definitions were added within the #ifdef CONFIG_CPU_6338 section while some other were added within #ifdef CONFIG_CPU_6345, fix this SVN-Revision: 32060
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
index f561529434..c8da9932d4 100644
--- a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -29,12 +29,16 @@
+@@ -30,12 +30,16 @@
#include <bcm63xx_dev_pcmcia.h>
#include <bcm63xx_dev_spi.h>
#include <board_bcm963xx.h>
@@ -17,7 +17,7 @@
static struct bcm963xx_nvram nvram;
static unsigned int mac_addr_used;
static struct board_info board;
-@@ -725,6 +729,29 @@ static int board_get_mac_address(u8 *mac
+@@ -726,6 +730,29 @@ static int board_get_mac_address(u8 *mac
return 0;
}
@@ -47,7 +47,7 @@
/*
* early init callback, read nvram data from flash and checksum it
*/
-@@ -766,6 +793,11 @@ void __init board_prom_init(void)
+@@ -767,6 +794,11 @@ void __init board_prom_init(void)
return;
}