diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-03 01:53:30 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-03 01:53:30 +0000 |
| commit | e2a6028da3eccac80337a17129174ae2d7716b66 (patch) | |
| tree | 80c467f23a4f364b9be69716075cd3b186161e62 /target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch | |
| parent | ae4d4c4a99d64d402a985e12510a5e05598c6200 (diff) | |
brcm47xx: add a new version of the nvram rewrite patch
This is the version like it was send for mainline inclusion.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34988 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch index cc9c178be0..fe65cc451d 100644 --- a/target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch @@ -406,14 +406,14 @@ } -#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) |