diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-08 15:39:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-08 15:39:41 -0700 |
| commit | 54dceb008ffcbe003bea9017cad1227a83b6fc3f (patch) | |
| tree | d4e3345ead16da19efe38dbf97ade38309f8b4f7 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | 11a100f844f6096787ab20e19f17d72abc957a8f (diff) | |
| parent | b46372710ab536c0967f76be5dc41341583d4a54 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index d1289cfc213..c8d3d97cf48 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -929,7 +929,7 @@ struct iwl_priv { struct iwl_init_alive_resp card_alive_init; struct iwl_alive_resp card_alive; #ifdef CONFIG_IWLWIFI_RFKILL - struct iwl_rfkill_mngr rfkill_mngr; + struct rfkill *rfkill; #endif #ifdef CONFIG_IWLWIFI_LEDS @@ -1103,7 +1103,7 @@ static inline void iwl_txq_ctx_deactivate(struct iwl_priv *priv, int txq_id) clear_bit(txq_id, &priv->txq_ctx_active_msk); } -#ifdef CONFIG_IWLWIF_DEBUG +#ifdef CONFIG_IWLWIFI_DEBUG const char *iwl_get_tx_fail_reason(u32 status); #else static inline const char *iwl_get_tx_fail_reason(u32 status) { return ""; } |