diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-05-20 09:35:17 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-05-20 09:35:17 +0000 |
commit | 8513629e3ed39ac7d6d3ca90f1ad745db5c449d6 (patch) | |
tree | f38e2aa76f8ac55bf6eb361446250acce57956c5 /package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch | |
parent | 8f526ff53067d029f42e0b887d770b28546fc0e9 (diff) | |
download | upstream-8513629e3ed39ac7d6d3ca90f1ad745db5c449d6.tar.gz upstream-8513629e3ed39ac7d6d3ca90f1ad745db5c449d6.tar.bz2 upstream-8513629e3ed39ac7d6d3ca90f1ad745db5c449d6.zip |
mac80211: update to wireless-testing 2014-05-19
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 40800
Diffstat (limited to 'package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch')
-rw-r--r-- | package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch index 95f14f436e..d550bba6a5 100644 --- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch +++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch @@ -1,6 +1,6 @@ --- a/.local-symbols +++ b/.local-symbols -@@ -402,42 +402,6 @@ USB_CDC_PHONET= +@@ -403,42 +403,6 @@ USB_CDC_PHONET= USB_IPHETH= USB_SIERRA_NET= USB_VL600= @@ -68,7 +68,7 @@ obj-$(CPTCFG_NFC) += net/nfc/ --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -2734,7 +2734,7 @@ static struct ssb_device *b43_ssb_gpio_d +@@ -2723,7 +2723,7 @@ static struct ssb_device *b43_ssb_gpio_d { struct ssb_bus *bus = dev->dev->sdev->bus; @@ -77,12 +77,12 @@ return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev); #else return bus->chipco.dev; -@@ -4751,7 +4751,7 @@ static int b43_wireless_core_init(struct +@@ -4688,7 +4688,7 @@ static int b43_wireless_core_init(struct } if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW) hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */ --#ifdef CPTCFG_SSB_DRIVER_PCICORE -+#ifdef CONFIG_SSB_DRIVER_PCICORE +-#if defined(CPTCFG_B43_SSB) && defined(CPTCFG_SSB_DRIVER_PCICORE) ++#if defined(CPTCFG_B43_SSB) && defined(CONFIG_SSB_DRIVER_PCICORE) if (dev->dev->bus_type == B43_BUS_SSB && dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI && dev->dev->sdev->bus->pcicore.dev->id.revision <= 10) |