diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-25 14:51:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-25 14:51:42 -0400 |
| commit | e569aa78ba01f7f66e016a4d57310fd041524d17 (patch) | |
| tree | eaedc03d42ee2bf6200fc07b080a99bad103def3 /drivers/net/wireless/ath/ath9k/calib.h | |
| parent | 4562487a00445eab96311365ba15c41dc4d043cd (diff) | |
| parent | 268bae0b6879f238ba57f5f801958d1254e136f7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas/if_sdio.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/calib.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/calib.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/calib.h b/drivers/net/wireless/ath/ath9k/calib.h index 0a304b3eeeb6..5b053a6260b2 100644 --- a/drivers/net/wireless/ath/ath9k/calib.h +++ b/drivers/net/wireless/ath/ath9k/calib.h | |||
| @@ -113,6 +113,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan); | |||
| 113 | bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan); | 113 | bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan); |
| 114 | void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah, | 114 | void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah, |
| 115 | struct ath9k_channel *chan); | 115 | struct ath9k_channel *chan); |
| 116 | void ath9k_hw_bstuck_nfcal(struct ath_hw *ah); | ||
| 116 | s16 ath9k_hw_getchan_noise(struct ath_hw *ah, struct ath9k_channel *chan); | 117 | s16 ath9k_hw_getchan_noise(struct ath_hw *ah, struct ath9k_channel *chan); |
| 117 | void ath9k_hw_reset_calibration(struct ath_hw *ah, | 118 | void ath9k_hw_reset_calibration(struct ath_hw *ah, |
| 118 | struct ath9k_cal_list *currCal); | 119 | struct ath9k_cal_list *currCal); |