aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-priv.h1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-priv.h b/drivers/net/wireless/iwlwifi/iwl-priv.h
index 6b490d08fea9..f43679a42ae0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-priv.h
+++ b/drivers/net/wireless/iwlwifi/iwl-priv.h
@@ -278,7 +278,6 @@ struct iwl_priv {
278#define IWL_DEFAULT_TX_POWER 0x0F 278#define IWL_DEFAULT_TX_POWER 0x0F
279 s8 user_txpower_limit; 279 s8 user_txpower_limit;
280 s8 max_channel_txpower_limit; 280 s8 max_channel_txpower_limit;
281 u32 cck_power_index_compensation;
282 281
283#ifdef CONFIG_PM 282#ifdef CONFIG_PM
284 u32 pm_state[16]; 283 u32 pm_state[16];
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index fa11eb95699b..60174202ca1e 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -9088,8 +9088,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
9088 priv->channel_width = IWL_CHANNEL_WIDTH_40MHZ; 9088 priv->channel_width = IWL_CHANNEL_WIDTH_40MHZ;
9089 priv->valid_antenna = 0x7; /* assume all 3 connected */ 9089 priv->valid_antenna = 0x7; /* assume all 3 connected */
9090 priv->ps_mode = IWL_MIMO_PS_NONE; 9090 priv->ps_mode = IWL_MIMO_PS_NONE;
9091 priv->cck_power_index_compensation = iwl_read32(
9092 priv, CSR_HW_REV_WA_REG);
9093 9091
9094 iwl4965_set_rxon_chain(priv); 9092 iwl4965_set_rxon_chain(priv);
9095 9093