diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 11:22:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 11:22:54 +0000 |
| commit | a1926d1745114789687ac029ae8c58944b7d2256 (patch) | |
| tree | c303e75615e378451a80b97bfd2c1ba54029d9bb /include/linux/ssb/ssb_driver_gige.h | |
| parent | 492e917635a0fa05439bb562fd51577efc9cef30 (diff) | |
| parent | 52fc43f7c1c416b114e88ff39635c36e67ef15b6 (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'include/linux/ssb/ssb_driver_gige.h')
| -rw-r--r-- | include/linux/ssb/ssb_driver_gige.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/linux/ssb/ssb_driver_gige.h b/include/linux/ssb/ssb_driver_gige.h index 942e38736901..eba52a100533 100644 --- a/include/linux/ssb/ssb_driver_gige.h +++ b/include/linux/ssb/ssb_driver_gige.h @@ -96,16 +96,21 @@ static inline bool ssb_gige_must_flush_posted_writes(struct pci_dev *pdev) return 0; } -extern char * nvram_get(const char *name); +#ifdef CONFIG_BCM47XX +#include <asm/mach-bcm47xx/nvram.h> /* Get the device MAC address */ static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr) { -#ifdef CONFIG_BCM47XX - char *res = nvram_get("et0macaddr"); - if (res) - memcpy(macaddr, res, 6); -#endif + char buf[20]; + if (nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0) + return; + nvram_parse_macaddr(buf, macaddr); } +#else +static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr) +{ +} +#endif extern int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev, struct pci_dev *pdev); |