aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-03-28 20:42:25 +0000
committerJonas Gorski <jogo@openwrt.org>2012-03-28 20:42:25 +0000
commit78fb818f7c46f45272c1ef00c40febe6fc30ace5 (patch)
tree2e12755cb3c115cfdafb9fa9c68810d76032a704 /target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
parenta2adca6ee9a731aa2b0ee7ca246db8f941266ed6 (diff)
downloadupstream-78fb818f7c46f45272c1ef00c40febe6fc30ace5.tar.gz
upstream-78fb818f7c46f45272c1ef00c40febe6fc30ace5.tar.bz2
upstream-78fb818f7c46f45272c1ef00c40febe6fc30ace5.zip
bcm63xx: replace SPI driver with latest upstream version
SVN-Revision: 31130
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.patch8
1 files changed, 4 insertions, 4 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 96b871dbfb..227a852797 100644
--- a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
@@ -1,8 +1,8 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -28,9 +28,13 @@
- #include <bcm63xx_dev_dsp.h>
+@@ -29,9 +29,13 @@
#include <bcm63xx_dev_pcmcia.h>
+ #include <bcm63xx_dev_spi.h>
#include <board_bcm963xx.h>
+#include <bcm_tag.h>
@@ -14,7 +14,7 @@
static struct bcm963xx_nvram nvram;
static unsigned int mac_addr_used;
static struct board_info board;
-@@ -721,6 +725,29 @@ static int board_get_mac_address(u8 *mac
+@@ -722,6 +726,29 @@ static int board_get_mac_address(u8 *mac
return 0;
}
@@ -44,7 +44,7 @@
/*
* early init callback, read nvram data from flash and checksum it
*/
-@@ -762,6 +789,11 @@ void __init board_prom_init(void)
+@@ -763,6 +790,11 @@ void __init board_prom_init(void)
return;
}