aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-05-23 18:48:35 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-05-23 18:48:35 +0000
commit4e5453c94cd5f16a55548a5688c421ee58ca3f7e (patch)
treefda1569005e6ddbeaf8338e2bebba581805e9c7a /package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
parentb82d436d9b0cd6703e2b902e544c4b8c80c6e54f (diff)
downloadupstream-4e5453c94cd5f16a55548a5688c421ee58ca3f7e.tar.gz
upstream-4e5453c94cd5f16a55548a5688c421ee58ca3f7e.tar.bz2
upstream-4e5453c94cd5f16a55548a5688c421ee58ca3f7e.zip
mac80211: update to wireless-testing 2014-05-22
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40834 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch4
1 files changed, 2 insertions, 2 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 d550bba6a5..93197ae9b6 100644
--- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
+++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
@@ -68,7 +68,7 @@
obj-$(CPTCFG_NFC) += net/nfc/
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -2723,7 +2723,7 @@ static struct ssb_device *b43_ssb_gpio_d
+@@ -2733,7 +2733,7 @@ static struct ssb_device *b43_ssb_gpio_d
{
struct ssb_bus *bus = dev->dev->sdev->bus;
@@ -77,7 +77,7 @@
return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
#else
return bus->chipco.dev;
-@@ -4688,7 +4688,7 @@ static int b43_wireless_core_init(struct
+@@ -4698,7 +4698,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. */