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

[openwrt.git] / package / mac80211 / patches / 820-b43-backport.patch

diff --git a/package/mac80211/patches/820-b43-backport.patch b/package/mac80211/patches/820-b43-backport.patch
index ec3b144..3dbf936 100644 (file)
--- a/package/mac80211/patches/820-b43-backport.patch
+++ b/package/mac80211/patches/820-b43-backport.patch
@@ -309,7 +309,7 @@
  #endif /* B43_BUS_H_ */
 --- a/drivers/net/wireless/b43/dma.c
 +++ b/drivers/net/wireless/b43/dma.c
-@@ -174,7 +174,7 @@ static void op64_fill_descriptor(struct
+@@ -174,7 +174,7 @@ static void op64_fill_descriptor(struct 
        addrhi = (((u64) dmaaddr >> 32) & ~SSB_DMA_TRANSLATION_MASK);
        addrext = (((u64) dmaaddr >> 32) & SSB_DMA_TRANSLATION_MASK)
            >> SSB_DMA_TRANSLATION_SHIFT;