summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.6/400-arch-bcm47xx.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-03 01:53:30 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-03 01:53:30 +0000
commite2a6028da3eccac80337a17129174ae2d7716b66 (patch)
tree80c467f23a4f364b9be69716075cd3b186161e62 /target/linux/brcm47xx/patches-3.6/400-arch-bcm47xx.patch
parentae4d4c4a99d64d402a985e12510a5e05598c6200 (diff)
brcm47xx: add a new version of the nvram rewrite patch
This is the version like it was send for mainline inclusion. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34988 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/400-arch-bcm47xx.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.6/400-arch-bcm47xx.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-3.6/400-arch-bcm47xx.patch
index bdd2c040d..1ed0b8ab6 100644
--- a/target/linux/brcm47xx/patches-3.6/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-3.6/400-arch-bcm47xx.patch
@@ -1,9 +1,9 @@
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
-@@ -183,3 +183,30 @@ int nvram_getenv(char *name, char *val,
- return NVRAM_ERR_ENVNOTFOUND;
+@@ -196,3 +196,30 @@ int bcm47xx_nvram_getenv(char *name, cha
+ return -ENOENT;
}
- EXPORT_SYMBOL(nvram_getenv);
+ EXPORT_SYMBOL(bcm47xx_nvram_getenv);
+
+char *nvram_get(const char *name)
+{
@@ -13,7 +13,7 @@
+ return NULL;
+
+ if (!nvram_buf[0])
-+ early_nvram_init();
++ nvram_init();
+
+ /* Look for name=value and return value */
+ var = &nvram_buf[sizeof(struct nvram_header)];