mac80211: update to wireless-testing 2010-11-30

[openwrt.git] / package / mac80211 / patches / 407-ath9k-override-mac-address-from-platform-data.patch

diff --git a/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch b/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
index 3534194..d6bc34b 100644 (file)
--- a/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
+++ b/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
@@ -10,15 +10,15 @@
  #endif /* _LINUX_ATH9K_PLATFORM_H */
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -16,6 +16,7 @@
+@@ -15,6 +15,7 @@
+  */
  
  #include <linux/slab.h>
- #include <linux/pm_qos_params.h>
 +#include <linux/ath9k_platform.h>
  
  #include "ath9k.h"
  
-@@ -520,6 +521,7 @@ static void ath9k_init_misc(struct ath_s
+@@ -521,6 +522,7 @@ static void ath9k_init_misc(struct ath_s
  static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
                            const struct ath_bus_ops *bus_ops)
  {
@@ -26,7 +26,7 @@
        struct ath_hw *ah = NULL;
        struct ath_common *common;
        int ret = 0, i;
-@@ -565,6 +567,9 @@ static int ath9k_init_softc(u16 devid, s
+@@ -567,6 +569,9 @@ static int ath9k_init_softc(u16 devid, s
        if (ret)
                goto err_hw;