---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -431,11 +431,8 @@ static void ath9k_hw_init_defaults(struc
- ah->hw_version.magic = AR5416_MAGIC;
- ah->hw_version.subvendorid = 0;
-
-- ah->ah_flags = 0;
- if (ah->hw_version.devid == AR5416_AR9100_DEVID)
- ah->hw_version.macVersion = AR_SREV_VERSION_9100;
-- if (!AR_SREV_9100(ah))
-- ah->ah_flags = AH_USE_EEPROM;
-
- ah->atim_window = 0;
- ah->sta_id1_defaults = AR_STA_ID1_CRPT_MIC_ENABLE;
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -15,6 +15,7 @@
#include "ath9k.h"
#include "btcoex.h"
-@@ -1633,6 +1634,7 @@ static int ath_init_softc(u16 devid, str
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -534,6 +534,7 @@ static int ath9k_init_softc(u16 devid, s
{
struct ath_hw *ah = NULL;
struct ath_common *common;
+ struct ath9k_platform_data *pdata;
- int r = 0, i;
+ int ret = 0, i;
int csz = 0;
- int qnum;
-@@ -1656,6 +1658,10 @@ static int ath_init_softc(u16 devid, str
- ah->hw_version.devid = devid;
+@@ -545,6 +546,10 @@ static int ath9k_init_softc(u16 devid, s
ah->hw_version.subsysid = subsysid;
+ sc->sc_ah = ah;
+
+ pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
+ if (!pdata)
+ ah->ah_flags |= AH_USE_EEPROM;
+
- sc->sc_ah = ah;
-
common = ath9k_hw_common(ah);
+ common->ops = &ath9k_common_ops;
+ common->bus_ops = bus_ops;
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -421,10 +421,6 @@ static void ath9k_hw_init_defaults(struc
+ ah->hw_version.magic = AR5416_MAGIC;
+ ah->hw_version.subvendorid = 0;
+
+- ah->ah_flags = 0;
+- if (!AR_SREV_9100(ah))
+- ah->ah_flags = AH_USE_EEPROM;
+-
+ ah->atim_window = 0;
+ ah->sta_id1_defaults =
+ AR_STA_ID1_CRPT_MIC_ENABLE |