aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2011-08-04 20:04:54 +0000
committerHauke Mehrtens <hauke@openwrt.org>2011-08-04 20:04:54 +0000
commit871991d9fe32d99d6f5281254c232395f9265569 (patch)
treeabb83ec10bec5fca01feb069d06eb936196da867 /target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
parentc56fd84056e0a83c4bc4ff3707d3ad3a6db46506 (diff)
downloadupstream-871991d9fe32d99d6f5281254c232395f9265569.tar.gz
upstream-871991d9fe32d99d6f5281254c232395f9265569.tar.bz2
upstream-871991d9fe32d99d6f5281254c232395f9265569.zip
brcm47xx: update patches
* this adds sflash support for ssb devices * the flash is now a platform device * minor updates git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27902 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
index fe23dc61cd..46d47e3d01 100644
--- a/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
-@@ -117,3 +117,30 @@ int nvram_getenv(char *name, char *val,
+@@ -199,3 +199,30 @@ int nvram_getenv(char *name, char *val,
return NVRAM_ERR_ENVNOTFOUND;
}
EXPORT_SYMBOL(nvram_getenv);
@@ -33,8 +33,8 @@
+EXPORT_SYMBOL(nvram_get);
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
-@@ -438,3 +438,20 @@ static int __init bcm47xx_register_flash
- return 0;
+@@ -468,3 +468,20 @@ static int __init bcm47xx_register_flash
+ return -1;
}
fs_initcall(bcm47xx_register_flash);
+