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 /drivers/net/ethernet/broadcom | |
parent | f36738ddfeea02867b393e7f34da0cec48bafc54 (diff) | |
download | linux-stable-111bd981e2216827aab95503596501ab71bc7a7d.tar.gz linux-stable-111bd981e2216827aab95503596501ab71bc7a7d.tar.bz2 linux-stable-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 'drivers/net/ethernet/broadcom')
-rw-r--r-- | drivers/net/ethernet/broadcom/b44.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index 219f6226fcb1..330b0908bf97 100644 --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c @@ -381,7 +381,7 @@ static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote) } #ifdef CONFIG_BCM47XX -#include <asm/mach-bcm47xx/nvram.h> +#include <bcm47xx_nvram.h> static void b44_wap54g10_workaround(struct b44 *bp) { char buf[20]; @@ -393,7 +393,7 @@ static void b44_wap54g10_workaround(struct b44 *bp) * see https://dev.openwrt.org/ticket/146 * check and reset bit "isolate" */ - if (nvram_getenv("boardnum", buf, sizeof(buf)) < 0) + if (bcm47xx_nvram_getenv("boardnum", buf, sizeof(buf)) < 0) return; if (simple_strtoul(buf, NULL, 0) == 2) { err = __b44_readphy(bp, 0, MII_BMCR, &val); |