git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
ar9003_eeprom.c
diff --git
a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 057fb69ddf7fbc56e76b010a1cc21833fdc2b078..c4182359bee46603cffc46e9781750087f2a5f0f 100644
(file)
--- a/
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@
-968,7
+968,7
@@
static int ath9k_hw_ar9300_get_eeprom_rev(struct ath_hw *ah)
}
static u8 ath9k_hw_ar9300_get_num_ant_config(struct ath_hw *ah,
- enum
ieee80211
_band freq_band)
+ enum
ath9k_hal_freq
_band freq_band)
{
return 1;
}