mac80211: update to wireless-testing 2010-11-10 + some pending work

[openwrt/openwrt.git] / package / mac80211 / patches / 406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch

diff --git a/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch b/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
index 615bce5619675e52b15b811b4a024624422604d5..87ea00a2acdc006b8a6aed46272a3a8096ed55e3 100644 (file)
--- a/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
+++ b/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
@@ -1,16 +1,16 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -15,6 +15,7 @@
-  */
+@@ -16,6 +16,7 @@
  
  #include <linux/nl80211.h>
+ #include <linux/pm_qos_params.h>
 +#include <linux/ath9k_platform.h>
  #include "ath9k.h"
  #include "btcoex.h"
  
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -559,6 +559,7 @@ static int ath9k_init_softc(u16 devid, s
+@@ -522,6 +522,7 @@ static int ath9k_init_softc(u16 devid, s
  {
        struct ath_hw *ah = NULL;
        struct ath_common *common;
@@ -18,7 +18,7 @@
        int ret = 0, i;
        int csz = 0;
  
-@@ -570,6 +571,10 @@ static int ath9k_init_softc(u16 devid, s
+@@ -533,6 +534,10 @@ static int ath9k_init_softc(u16 devid, s
        ah->hw_version.subsysid = subsysid;
        sc->sc_ah = ah;