aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/810-b43_no_pio.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-07-12 15:37:34 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-07-12 15:37:34 +0000
commit6be23f52ec5dd472530e7b142e70ac2fc1fabb80 (patch)
treebf446f46bdaf257976a44cd0138e0b944fab33f9 /package/kernel/mac80211/patches/810-b43_no_pio.patch
parent21c1ff957d79155da0a763e7fda9aa2075ea907f (diff)
downloadmaster-187ad058-6be23f52ec5dd472530e7b142e70ac2fc1fabb80.tar.gz
master-187ad058-6be23f52ec5dd472530e7b142e70ac2fc1fabb80.tar.bz2
master-187ad058-6be23f52ec5dd472530e7b142e70ac2fc1fabb80.zip
mac80211: b43: backport b43 patches from wireless testing
This brings b43 up to wireless-testing/master master-2014-07-10 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41593 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/810-b43_no_pio.patch')
-rw-r--r--package/kernel/mac80211/patches/810-b43_no_pio.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/810-b43_no_pio.patch b/package/kernel/mac80211/patches/810-b43_no_pio.patch
index 2023bf6c02..2cea894ceb 100644
--- a/package/kernel/mac80211/patches/810-b43_no_pio.patch
+++ b/package/kernel/mac80211/patches/810-b43_no_pio.patch
@@ -1,8 +1,8 @@
--- a/drivers/net/wireless/b43/Makefile
+++ b/drivers/net/wireless/b43/Makefile
-@@ -20,7 +20,7 @@ b43-y += xmit.o
- b43-y += lo.o
- b43-y += wa.o
+@@ -16,7 +16,7 @@ b43-$(CPTCFG_B43_PHY_LCN) += phy_lcn.o t
+ b43-y += sysfs.o
+ b43-y += xmit.o
b43-y += dma.o
-b43-y += pio.o
+b43-$(CPTCFG_B43_PIO) += pio.o
@@ -11,7 +11,7 @@
b43-$(CPTCFG_B43_PCMCIA) += pcmcia.o
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -1909,10 +1909,12 @@ static void b43_do_interrupt_thread(stru
+@@ -1913,10 +1913,12 @@ static void b43_do_interrupt_thread(stru
dma_reason[0], dma_reason[1],
dma_reason[2], dma_reason[3],
dma_reason[4], dma_reason[5]);