summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-04-28 16:52:11 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-04-28 16:52:11 +0000
commit1bac172c44fd96ee1c5ed94ce2879b15c7a23745 (patch)
treeebb49ea0f4f71c657aaf7c9a0c54521ea6e1fc9e /target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch
parentf1e214411d8fe78a19d4df6837f4cbc4aa136667 (diff)
downloadmaster-31e0f0ae-1bac172c44fd96ee1c5ed94ce2879b15c7a23745.tar.gz
master-31e0f0ae-1bac172c44fd96ee1c5ed94ce2879b15c7a23745.tar.bz2
master-31e0f0ae-1bac172c44fd96ee1c5ed94ce2879b15c7a23745.zip
kernel: update bcma and ssb for kernel 3.8+ to version from wireless-testing master-2013-04-26.
SVN-Revision: 36473
Diffstat (limited to 'target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch20
1 files changed, 0 insertions, 20 deletions
diff --git a/target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch b/target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch
index 04c378f33e..4606c2310f 100644
--- a/target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch
+++ b/target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch
@@ -450,23 +450,3 @@
crystalfreq = simple_strtoul(buf, NULL, 0);
#endif
}
---- 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_p
- }
-
- #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)