diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-10-10 10:27:17 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:13 -0400 |
commit | 6a686c600268b71619f93d35f9373e2b6ab5947b (patch) | |
tree | f57423fe69cb6e3baa982b9b7d9b915818e11afb /drivers/net/wireless/iwlwifi/iwl-core.h | |
parent | 8c22254454eaa4f483103c6850f6f16d4f09c161 (diff) |
iwlagn: move iwl_enable_rfkill_int and kill iwl-helpers.h
Move iwl_enable_rfkill_int to iwl-core.h, and remove the empty
iwl-helpers.h
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 151cc43ec519..137da3380704 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -64,6 +64,7 @@ | |||
64 | #define __iwl_core_h__ | 64 | #define __iwl_core_h__ |
65 | 65 | ||
66 | #include "iwl-dev.h" | 66 | #include "iwl-dev.h" |
67 | #include "iwl-io.h" | ||
67 | 68 | ||
68 | /************************ | 69 | /************************ |
69 | * forward declarations * | 70 | * forward declarations * |
@@ -382,6 +383,12 @@ static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv) | |||
382 | priv->cfg->bt_params->advanced_bt_coexist; | 383 | priv->cfg->bt_params->advanced_bt_coexist; |
383 | } | 384 | } |
384 | 385 | ||
386 | static inline void iwl_enable_rfkill_int(struct iwl_priv *priv) | ||
387 | { | ||
388 | IWL_DEBUG_ISR(priv, "Enabling rfkill interrupt\n"); | ||
389 | iwl_write32(bus(priv), CSR_INT_MASK, CSR_INT_BIT_RF_KILL); | ||
390 | } | ||
391 | |||
385 | extern bool bt_siso_mode; | 392 | extern bool bt_siso_mode; |
386 | 393 | ||
387 | #endif /* __iwl_core_h__ */ | 394 | #endif /* __iwl_core_h__ */ |