lantiq: Tune the XWAY subtarget cflags
[openwrt/staging/yousong.git] / package / mac80211 / patches / 810-b43_no_pio.patch
index 2827517a74ae063ae0a9f2ed096e2ac796965a0a..0821dc7856b01e558eca21d55e548c7032da1d57 100644 (file)
@@ -1,29 +1,29 @@
 --- a/drivers/net/wireless/b43/Makefile
 +++ b/drivers/net/wireless/b43/Makefile
-@@ -19,7 +19,7 @@ b43-y                                += xmit.o
+@@ -20,7 +20,7 @@ b43-y                                += xmit.o
  b43-y                         += lo.o
  b43-y                         += wa.o
  b43-y                         += dma.o
 -b43-y                         += pio.o
 +b43-$(CONFIG_B43_PIO)         += pio.o
  b43-y                         += rfkill.o
- b43-$(CONFIG_B43_LEDS)                += leds.o
- b43-$(CONFIG_B43_PCMCIA)      += pcmcia.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
-@@ -1885,10 +1885,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]);
+@@ -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]);
 +#ifdef CONFIG_B43_PIO
-                       b43err(dev->wl, "This device does not support DMA "
+               b43err(dev->wl, "This device does not support DMA "
                               "on your system. It will now be switched to PIO.\n");
-                       /* Fall back to PIO transfers if we get fatal DMA errors! */
-                       dev->use_pio = true;
+               /* Fall back to PIO transfers if we get fatal DMA errors! */
+               dev->use_pio = true;
 +#endif
-                       b43_controller_restart(dev, "DMA error");
-                       return;
-               }
+               b43_controller_restart(dev, "DMA error");
+               return;
+       }
 --- a/drivers/net/wireless/b43/pio.h
 +++ b/drivers/net/wireless/b43/pio.h
 @@ -150,7 +150,7 @@ static inline void b43_piorx_write32(str
 +#endif /* CONFIG_B43_PIO */
  
  #endif /* B43_PIO_H_ */
+--- a/drivers/net/wireless/b43/Kconfig
++++ b/drivers/net/wireless/b43/Kconfig
+@@ -104,7 +104,7 @@ config B43_BCMA_PIO
+       default y
+ config B43_PIO
+-      bool
++      bool "Broadcom 43xx PIO support"
+       depends on B43
+       select SSB_BLOCKIO
+       default y