diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-15 16:21:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-15 16:21:34 -0400 |
| commit | 5c01d5669356e13f0fb468944c1dd4c6a7e978ad (patch) | |
| tree | fa43345288d7b25fac92b3b35360a177c4947313 /drivers/net/wireless/iwlwifi/iwl-calib.c | |
| parent | fea069152614cdeefba4b2bf80afcddb9c217fc8 (diff) | |
| parent | a5e944f1d955f3819503348426763e21e0413ba6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/wl12xx/wl1271_main.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-calib.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-calib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c index de3b3f403d1f..0471c3f8713e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-calib.c +++ b/drivers/net/wireless/iwlwifi/iwl-calib.c | |||
| @@ -593,7 +593,7 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv, | |||
| 593 | IWL_DEBUG_CALIB(priv, "rx_enable_time = %u usecs\n", rx_enable_time); | 593 | IWL_DEBUG_CALIB(priv, "rx_enable_time = %u usecs\n", rx_enable_time); |
| 594 | 594 | ||
| 595 | if (!rx_enable_time) { | 595 | if (!rx_enable_time) { |
| 596 | IWL_DEBUG_CALIB(priv, "<< RX Enable Time == 0! \n"); | 596 | IWL_DEBUG_CALIB(priv, "<< RX Enable Time == 0!\n"); |
| 597 | return; | 597 | return; |
| 598 | } | 598 | } |
| 599 | 599 | ||