ath9k: fold patches that were merged upstream into 300-pending_work.patch

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 850-b43-add-core-rev-17-used-on-bcma-SoC.patch

diff --git a/package/mac80211/patches/850-b43-add-core-rev-17-used-on-bcma-SoC.patch b/package/mac80211/patches/850-b43-add-core-rev-17-used-on-bcma-SoC.patch
index 24a38b596d694a5a71806c4ffa074159318aabb1..91a836459b77ed30898f9966e8d859365c0f6719 100644 (file)
--- a/package/mac80211/patches/850-b43-add-core-rev-17-used-on-bcma-SoC.patch
+++ b/package/mac80211/patches/850-b43-add-core-rev-17-used-on-bcma-SoC.patch
@@ -11,7 +11,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -120,6 +120,7 @@ MODULE_PARM_DESC(pio, "Use PIO accesses
+@@ -120,6 +120,7 @@ MODULE_PARM_DESC(pio, "Use PIO accesses 
  
  #ifdef CONFIG_B43_BCMA
  static const struct bcma_device_id b43_bcma_tbl[] = {