diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-26 19:51:14 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2013-02-15 19:01:57 +0100 |
commit | 111bd981e2216827aab95503596501ab71bc7a7d (patch) | |
tree | b4895d5923bd065ab1dfa74cae893c24c97bc340 /arch/mips/bcm47xx/nvram.c | |
parent | f36738ddfeea02867b393e7f34da0cec48bafc54 (diff) | |
download | op-kernel-dev-111bd981e2216827aab95503596501ab71bc7a7d.zip op-kernel-dev-111bd981e2216827aab95503596501ab71bc7a7d.tar.gz |
MIPS: BCM47XX: add bcm47xx prefix in front of nvram function names
The nvram functions are exported and used by some normal drivers. To
prevent name clashes with ofter parts of the kernel code add a bcm47xx_
prefix in front of the function names and the header file name.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Patchwork: http://patchwork.linux-mips.org/patch/4744/
Signed-off-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'arch/mips/bcm47xx/nvram.c')
-rw-r--r-- | arch/mips/bcm47xx/nvram.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c index b4a47fc..e63bd5a 100644 --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c @@ -18,7 +18,7 @@ #include <linux/kernel.h> #include <linux/string.h> #include <asm/addrspace.h> -#include <asm/mach-bcm47xx/nvram.h> +#include <bcm47xx_nvram.h> #include <asm/mach-bcm47xx/bcm47xx.h> static char nvram_buf[NVRAM_SPACE]; @@ -159,7 +159,7 @@ static int nvram_init(void) return -ENXIO; } -int nvram_getenv(char *name, char *val, size_t val_len) +int bcm47xx_nvram_getenv(char *name, char *val, size_t val_len) { char *var, *value, *end, *eq; int err; @@ -189,4 +189,4 @@ int nvram_getenv(char *name, char *val, size_t val_len) } return -ENOENT; } -EXPORT_SYMBOL(nvram_getenv); +EXPORT_SYMBOL(bcm47xx_nvram_getenv); |