From 818ae8704441755e9da044d8007acbd406f481c9 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 26 Dec 2012 19:51:12 +0000
Subject: [PATCH] --- yaml --- r: 360029 b: refs/heads/master c:
 e58da16f716c0e7822e64a5d8a1f413041bc912e h: refs/heads/master i:   360027:
 21fb5055571e5d99cedd1ce9ad338ce8eeab5045 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/mips/bcm47xx/nvram.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fa472c246cfb..f8018011ca59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4485671fbbb6fc453c2fb2dbb4bfc374770b0e7
+refs/heads/master: e58da16f716c0e7822e64a5d8a1f413041bc912e
diff --git a/trunk/arch/mips/bcm47xx/nvram.c b/trunk/arch/mips/bcm47xx/nvram.c
index 42e527121314..6cf3ef29d844 100644
--- a/trunk/arch/mips/bcm47xx/nvram.c
+++ b/trunk/arch/mips/bcm47xx/nvram.c
@@ -112,7 +112,7 @@ static int nvram_init_bcma(void)
 }
 #endif
 
-static int early_nvram_init(void)
+static int nvram_init(void)
 {
 	switch (bcm47xx_bus_type) {
 #ifdef CONFIG_BCM47XX_SSB
@@ -136,7 +136,7 @@ int nvram_getenv(char *name, char *val, size_t val_len)
 		return -EINVAL;
 
 	if (!nvram_buf[0]) {
-		err = early_nvram_init();
+		err = nvram_init();
 		if (err)
 			return err;
 	}