diff options
| author | Hauke Mehrtens | 2012-12-26 20:51:14 +0100 |
|---|---|---|
| committer | John Crispin | 2013-02-15 19:01:57 +0100 |
| commit | 111bd981e2216827aab95503596501ab71bc7a7d (patch) | |
| tree | b4895d5923bd065ab1dfa74cae893c24c97bc340 /arch/mips/bcm47xx/sprom.c | |
| parent | MIPS: BCM47XX: handle different nvram sizes (diff) | |
| download | kernel-qcow2-linux-111bd981e2216827aab95503596501ab71bc7a7d.tar.gz kernel-qcow2-linux-111bd981e2216827aab95503596501ab71bc7a7d.tar.xz kernel-qcow2-linux-111bd981e2216827aab95503596501ab71bc7a7d.zip | |
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/sprom.c')
| -rw-r--r-- | arch/mips/bcm47xx/sprom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c index 66b71c363300..89b9bf46b13b 100644 --- a/arch/mips/bcm47xx/sprom.c +++ b/arch/mips/bcm47xx/sprom.c @@ -27,7 +27,7 @@ */ #include <bcm47xx.h> -#include <nvram.h> +#include <bcm47xx_nvram.h> static void create_key(const char *prefix, const char *postfix, const char *name, char *buf, int len) @@ -50,10 +50,10 @@ static int get_nvram_var(const char *prefix, const char *postfix, create_key(prefix, postfix, name, key, sizeof(key)); - err = nvram_getenv(key, buf, len); + err = bcm47xx_nvram_getenv(key, buf, len); if (fallback && err == -ENOENT && prefix) { create_key(NULL, postfix, name, key, sizeof(key)); - err = nvram_getenv(key, buf, len); + err = bcm47xx_nvram_getenv(key, buf, len); } return err; } @@ -144,7 +144,7 @@ static void nvram_read_macaddr(const char *prefix, const char *name, if (err < 0) return; - nvram_parse_macaddr(buf, *val); + bcm47xx_nvram_parse_macaddr(buf, *val); } static void nvram_read_alpha2(const char *prefix, const char *name, |