kernel: update bcma and ssb for kernel 3.8+ to version from wireless-testing master...

[openwrt.git] / target / linux / brcm47xx / patches-3.8 / 080-MIPS-BCM47XX-rewrite-nvram-probing.patch

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 04c378f..4606c23 100644 (file)
--- 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)