diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-09 14:40:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-09 14:40:09 -0700 |
| commit | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (patch) | |
| tree | e5e6cc8637a44354997624f26d4d55834c9915b4 /drivers/net/wireless/ath/ath9k/eeprom.c | |
| parent | cd7e1f0b056c071860db65c847a854b3093d6606 (diff) | |
| parent | eab2ec83dbf0e32e28f3108f302ffdaa225d4cce (diff) | |
| download | linux-8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc.tar.gz linux-8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc.tar.bz2 linux-8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/eeprom.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c index b6e52d0f8c48..dacaae934148 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom.c +++ b/drivers/net/wireless/ath/ath9k/eeprom.c @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "ath9k.h" +#include "hw.h" static inline u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz) { @@ -83,11 +83,9 @@ bool ath9k_hw_get_lower_upper_index(u8 target, u8 *pList, u16 listSize, return false; } -bool ath9k_hw_nvram_read(struct ath_hw *ah, u32 off, u16 *data) +bool ath9k_hw_nvram_read(struct ath_common *common, u32 off, u16 *data) { - struct ath_softc *sc = ah->ah_sc; - - return sc->bus_ops->eeprom_read(ah, off, data); + return common->bus_ops->eeprom_read(common, off, data); } void ath9k_hw_fill_vpd_table(u8 pwrMin, u8 pwrMax, u8 *pPwrList, |