diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-18 17:03:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-18 17:03:41 -0500 |
| commit | b67afe7f43afd2f5cd98798993561920c1684c12 (patch) | |
| tree | e45a0e41c91a1d199fd865b011ed0d25f5497bb9 /drivers/net/wireless/ath/ath5k | |
| parent | db28569adc692d9fb8a2d2d8e7ebab7fd5481f10 (diff) | |
| parent | 28bec7b845e10b68e6ba1ade5de0fc566690fc61 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
Diffstat (limited to 'drivers/net/wireless/ath/ath5k')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/phy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index d673ab2f6cda..62ce2f4e8605 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c | |||
| @@ -1281,6 +1281,7 @@ static int ath5k_hw_channel(struct ath5k_hw *ah, | |||
| 1281 | case AR5K_RF5111: | 1281 | case AR5K_RF5111: |
| 1282 | ret = ath5k_hw_rf5111_channel(ah, channel); | 1282 | ret = ath5k_hw_rf5111_channel(ah, channel); |
| 1283 | break; | 1283 | break; |
| 1284 | case AR5K_RF2317: | ||
| 1284 | case AR5K_RF2425: | 1285 | case AR5K_RF2425: |
| 1285 | ret = ath5k_hw_rf2425_channel(ah, channel); | 1286 | ret = ath5k_hw_rf2425_channel(ah, channel); |
| 1286 | break; | 1287 | break; |