diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-08 11:28:35 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-08 11:28:35 -0400 |
| commit | d2e5cb4e22080578f5d7e66824f85cf0e11d65e4 (patch) | |
| tree | f0e909d7cf4cf4e81c47aa33a2012448409b12fe /drivers/net/wireless/iwlwifi/mvm/rs.c | |
| parent | cabae81103584a8265114a543555781b7b0c88bd (diff) | |
| parent | 83f7a85f1134c6e914453f5747435415a23d516b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/rs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/rs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c index 9f52c5b3f0e..e1c83889936 100644 --- a/drivers/net/wireless/iwlwifi/mvm/rs.c +++ b/drivers/net/wireless/iwlwifi/mvm/rs.c @@ -1010,7 +1010,7 @@ static void rs_tx_status(void *mvm_r, struct ieee80211_supported_band *sband, return; } -#ifdef CPTCFG_MAC80211_DEBUGFS +#ifdef CONFIG_MAC80211_DEBUGFS /* Disable last tx check if we are debugging with fixed rate */ if (lq_sta->dbg_fixed_rate) { IWL_DEBUG_RATE(mvm, "Fixed rate. avoid rate scaling\n"); |