From 0c32efa8b83e75df39975212c18be5c95a736119 Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Wed, 2 Jul 2008 12:17:06 +0200 Subject: [PATCH] --- yaml --- r: 103351 b: refs/heads/master c: 994d31f7430c3639b73c6ee038bd437c926b1227 h: refs/heads/master i: 103349: eba7d0ef1a6a727db06279bfae7ba38ee197207e 103347: 44ccbdc12ff1a15cd4f58af5bda6f4d302f9b6fb 103343: 1668906cfbb176fade978b8759b35230b3862880 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-dev.h | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-tx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 634686e09a63..945d6e515ae0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e887d5b2fb909f18d153f47d2f3fdc2c76bb83a +refs/heads/master: 994d31f7430c3639b73c6ee038bd437c926b1227 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h index 70e10ea35a51..c8d3d97cf48d 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -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 ""; } diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c index 032641d4c7d1..0be2a71990b0 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -1493,7 +1493,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv, } EXPORT_SYMBOL(iwl_rx_reply_compressed_ba); -#ifdef CONFIG_IWLWIF_DEBUG +#ifdef CONFIG_IWLWIFI_DEBUG #define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x const char *iwl_get_tx_fail_reason(u32 status)