kernel: backport ssb changes from 4.4-rc1

[openwrt/staging/chunkeey.git] / package / kernel / mac80211 / patches / 810-b43_no_pio.patch

diff --git a/package/kernel/mac80211/patches/810-b43_no_pio.patch b/package/kernel/mac80211/patches/810-b43_no_pio.patch
index 5cd1b8bccdfbaccacc785e0ba774c4a5f46c868c..79175528ed3921d7873e153112656f56aa1c2549 100644 (file)
--- a/package/kernel/mac80211/patches/810-b43_no_pio.patch
+++ b/package/kernel/mac80211/patches/810-b43_no_pio.patch
@@ -1,17 +1,17 @@
 --- 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
+@@ -17,7 +17,7 @@ b43-$(CPTCFG_B43_PHY_AC)     += phy_ac.o
+ b43-y                         += sysfs.o
+ b43-y                         += xmit.o
  b43-y                         += dma.o
 -b43-y                         += pio.o
 +b43-$(CPTCFG_B43_PIO)         += pio.o
  b43-y                         += rfkill.o
+ b43-y                         += ppr.o
  b43-$(CPTCFG_B43_LEDS)                += leds.o
- 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
+@@ -2008,10 +2008,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]);
@@ -81,6 +81,6 @@
  config B43_PIO
 -      bool
 +      bool "Broadcom 43xx PIO support"
-       depends on B43
+       depends on B43 && B43_SSB
        select SSB_BLOCKIO
        default y