diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
commit | 3153b7589c0831fdce97081d1ecf5b9310725576 (patch) | |
tree | 5e4608250807827642c1d1fb19849d3671443ae7 /package/mac80211/patches/810-b43_no_pio.patch | |
parent | 312a176995ecf1b1b97a048451e4ff28b4336f85 (diff) | |
download | upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.gz upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.bz2 upstream-3153b7589c0831fdce97081d1ecf5b9310725576.zip |
AA: mac80211: sync with trunk r41113
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@41116 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/810-b43_no_pio.patch')
-rw-r--r-- | package/mac80211/patches/810-b43_no_pio.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/mac80211/patches/810-b43_no_pio.patch b/package/mac80211/patches/810-b43_no_pio.patch index 5cd1b8bccd..2023bf6c02 100644 --- a/package/mac80211/patches/810-b43_no_pio.patch +++ b/package/mac80211/patches/810-b43_no_pio.patch @@ -11,7 +11,7 @@ b43-$(CPTCFG_B43_PCMCIA) += pcmcia.o --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -1915,10 +1915,12 @@ static void b43_do_interrupt_thread(stru +@@ -1909,10 +1909,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]); @@ -75,12 +75,12 @@ #endif /* B43_PIO_H_ */ --- a/drivers/net/wireless/b43/Kconfig +++ b/drivers/net/wireless/b43/Kconfig -@@ -98,7 +98,7 @@ config B43_BCMA_PIO +@@ -118,7 +118,7 @@ config B43_BCMA_PIO default y config B43_PIO - bool + bool "Broadcom 43xx PIO support" - depends on B43 + depends on B43 && B43_SSB select SSB_BLOCKIO default y |