summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens2012-12-26 20:51:12 +0100
committerJohn Crispin2013-02-15 19:01:56 +0100
commite58da16f716c0e7822e64a5d8a1f413041bc912e (patch)
treec2f244fa5971eb4d421ad7197577b9d66a973946
parentMIPS: BCM47XX: nvram add nand flash support (diff)
downloadkernel-qcow2-linux-e58da16f716c0e7822e64a5d8a1f413041bc912e.tar.gz
kernel-qcow2-linux-e58da16f716c0e7822e64a5d8a1f413041bc912e.tar.xz
kernel-qcow2-linux-e58da16f716c0e7822e64a5d8a1f413041bc912e.zip
MIPS: BCM47XX: rename early_nvram_init to nvram_init
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Patchwork: http://patchwork.linux-mips.org/patch/4742/ Signed-off-by: John Crispin <blogic@openwrt.org>
-rw-r--r--arch/mips/bcm47xx/nvram.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
index 42e527121314..6cf3ef29d844 100644
--- a/arch/mips/bcm47xx/nvram.c
+++ b/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;
}