diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-26 19:51:14 (GMT) |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2013-02-15 18:01:57 (GMT) |
| commit | 111bd981e2216827aab95503596501ab71bc7a7d (patch) | |
| tree | b4895d5923bd065ab1dfa74cae893c24c97bc340 /include | |
| parent | f36738ddfeea02867b393e7f34da0cec48bafc54 (diff) | |
| download | linux-fsl-qoriq-111bd981e2216827aab95503596501ab71bc7a7d.tar.xz | |
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 'include')
| -rw-r--r-- | include/linux/ssb/ssb_driver_gige.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ssb/ssb_driver_gige.h b/include/linux/ssb/ssb_driver_gige.h index 6b05dcd..6d92a92 100644 --- a/include/linux/ssb/ssb_driver_gige.h +++ b/include/linux/ssb/ssb_driver_gige.h @@ -98,14 +98,14 @@ static inline bool ssb_gige_must_flush_posted_writes(struct pci_dev *pdev) } #ifdef CONFIG_BCM47XX -#include <asm/mach-bcm47xx/nvram.h> +#include <bcm47xx_nvram.h> /* Get the device MAC address */ static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr) { char buf[20]; - if (nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0) + if (bcm47xx_nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0) return; - nvram_parse_macaddr(buf, macaddr); + bcm47xx_nvram_parse_macaddr(buf, macaddr); } #else static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr) |