diff options
author | Senthil Balasubramanian <senthilkumar@atheros.com> | 2008-11-13 07:30:02 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-25 16:41:30 -0500 |
commit | e97275cb062cf927cdb086f0107657dd92160801 (patch) | |
tree | 611bb3cff70ebdfb5507f63c9b64cf10fffcdf97 /drivers/net/wireless/ath9k/hw.c | |
parent | f9bbf431beb7dd98b94fa965dab851432be4b762 (diff) |
ath9k: Build RFKILL feature even when RFKILL subsystem is a MODULE
Currently, ath9k builds RFKILL feature only when the RFKILL subsystem
is built part of the kernel. Build RFKILL feature regardless of whether
RFKILL subsystem is built as a MODULE or part of the kernel.
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/hw.c')
-rw-r--r-- | drivers/net/wireless/ath9k/hw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c index efeef2ca5350..82c2a4259ce4 100644 --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c | |||
@@ -2340,7 +2340,7 @@ bool ath9k_hw_reset(struct ath_hal *ah, struct ath9k_channel *chan, | |||
2340 | ath9k_hw_init_interrupt_masks(ah, ah->ah_opmode); | 2340 | ath9k_hw_init_interrupt_masks(ah, ah->ah_opmode); |
2341 | ath9k_hw_init_qos(ah); | 2341 | ath9k_hw_init_qos(ah); |
2342 | 2342 | ||
2343 | #ifdef CONFIG_RFKILL | 2343 | #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) |
2344 | if (ah->ah_caps.hw_caps & ATH9K_HW_CAP_RFSILENT) | 2344 | if (ah->ah_caps.hw_caps & ATH9K_HW_CAP_RFSILENT) |
2345 | ath9k_enable_rfkill(ah); | 2345 | ath9k_enable_rfkill(ah); |
2346 | #endif | 2346 | #endif |
@@ -3515,7 +3515,7 @@ bool ath9k_hw_fill_cap_info(struct ath_hal *ah) | |||
3515 | 3515 | ||
3516 | pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM; | 3516 | pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM; |
3517 | 3517 | ||
3518 | #ifdef CONFIG_RFKILL | 3518 | #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) |
3519 | ah->ah_rfsilent = ath9k_hw_get_eeprom(ah, EEP_RF_SILENT); | 3519 | ah->ah_rfsilent = ath9k_hw_get_eeprom(ah, EEP_RF_SILENT); |
3520 | if (ah->ah_rfsilent & EEP_RFSILENT_ENABLED) { | 3520 | if (ah->ah_rfsilent & EEP_RFSILENT_ENABLED) { |
3521 | ah->ah_rfkill_gpio = | 3521 | ah->ah_rfkill_gpio = |
@@ -3772,7 +3772,7 @@ void ath9k_hw_set_gpio(struct ath_hal *ah, u32 gpio, u32 val) | |||
3772 | AR_GPIO_BIT(gpio)); | 3772 | AR_GPIO_BIT(gpio)); |
3773 | } | 3773 | } |
3774 | 3774 | ||
3775 | #ifdef CONFIG_RFKILL | 3775 | #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) |
3776 | void ath9k_enable_rfkill(struct ath_hal *ah) | 3776 | void ath9k_enable_rfkill(struct ath_hal *ah) |
3777 | { | 3777 | { |
3778 | REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, | 3778 | REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, |