Merge branch 'akpm' (patches from Andrew)

[mirror_ubuntu-artful-kernel.git] / drivers / net / wireless / ath / ath9k / common-spectral.c

diff --git a/drivers/net/wireless/ath/ath9k/common-spectral.c b/drivers/net/wireless/ath/ath9k/common-spectral.c
index a8762711ad74b40ab7a0afa5b0f64820188f3011..e2512d5bc0e17c5e79d0fe8fd62f614fb9644208 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/common-spectral.c
+++ b/drivers/net/wireless/ath/ath9k/common-spectral.c
@@ -731,7 +731,7 @@ void ath9k_cmn_spectral_scan_trigger(struct ath_common *common,
        struct ath_hw *ah = spec_priv->ah;
        u32 rxfilter;
 
-       if (config_enabled(CONFIG_ATH9K_TX99))
+       if (IS_ENABLED(CONFIG_ATH9K_TX99))
                return;
 
        if (!ath9k_hw_ops(ah)->spectral_scan_trigger) {
@@ -806,7 +806,7 @@ static ssize_t write_file_spec_scan_ctl(struct file *file,
        char buf[32];
        ssize_t len;
 
-       if (config_enabled(CONFIG_ATH9K_TX99))
+       if (IS_ENABLED(CONFIG_ATH9K_TX99))
                return -EOPNOTSUPP;
 
        len = min(count, sizeof(buf) - 1);
@@ -1072,7 +1072,7 @@ static struct rchan_callbacks rfs_spec_scan_cb = {
 
 void ath9k_cmn_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv)
 {
-       if (config_enabled(CONFIG_ATH9K_DEBUGFS)) {
+       if (IS_ENABLED(CONFIG_ATH9K_DEBUGFS)) {
                relay_close(spec_priv->rfs_chan_spec_scan);
                spec_priv->rfs_chan_spec_scan = NULL;
        }