diff options
| author |   Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-10-10 07:27:18 -0700 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:14 -0400 |
| commit | 397ede37a4defbe0000f2cc994fe9b7225f33c89 (patch) | |
| tree | 18af4316eb9699b808be9e47c117efa211aaec9f /drivers/net | |
| parent | iwlagn: move iwl_enable_rfkill_int and kill iwl-helpers.h (diff) | |
| download | linux-dev-397ede37a4defbe0000f2cc994fe9b7225f33c89.tar.xz linux-dev-397ede37a4defbe0000f2cc994fe9b7225f33c89.zip | |
iwlagn: remove uneeded include to iwl-dev.h
iwl-core.c and iwl-trans-pcie-tx.c don't need to include iwl-dev.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')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index abd0de4a0e43..b247a56d5135 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -34,7 +34,6 @@ #include <net/mac80211.h> #include "iwl-eeprom.h" -#include "iwl-dev.h" /* FIXME: remove */ #include "iwl-debug.h" #include "iwl-core.h" #include "iwl-io.h" diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index 0d7803b85af3..4a0c95302a7e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c @@ -30,8 +30,6 @@ #include <linux/slab.h> #include <linux/sched.h> -/* TODO: remove include to iwl-dev.h */ -#include "iwl-dev.h" #include "iwl-debug.h" #include "iwl-csr.h" #include "iwl-prph.h" @@ -1020,9 +1018,8 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd) HOST_COMPLETE_TIMEOUT); if (!ret) { if (test_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status)) { - struct iwl_priv *priv = priv(trans); struct iwl_tx_queue *txq = - &trans_pcie->txq[priv->shrd->cmd_queue]; + &trans_pcie->txq[trans->shrd->cmd_queue]; struct iwl_queue *q = &txq->q; IWL_ERR(trans, |