diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-08-26 02:11:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 15:30:29 -0400 |
commit | 83ed90155f98bd949735c2cc22d832b557a6d7d1 (patch) | |
tree | 795ecd1ebd93357a80895825310c19315a633e49 /drivers/net/wireless/iwlwifi/iwl-rx.c | |
parent | a72b8b088c3465b28192c1a14ba97be8223a8cec (diff) |
iwlagn: all function iwl-io.c receive iwl_bus
Which means that iwl-io.c doesn't need to include iwl-dev.h any more.
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-rx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index d7c7c93b2daf..2c6659c82f92 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c | |||
@@ -531,16 +531,16 @@ static void iwl_rx_card_state_notif(struct iwl_priv *priv, | |||
531 | if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED | | 531 | if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED | |
532 | CT_CARD_DISABLED)) { | 532 | CT_CARD_DISABLED)) { |
533 | 533 | ||
534 | iwl_write32(priv, CSR_UCODE_DRV_GP1_SET, | 534 | iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_SET, |
535 | CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); | 535 | CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); |
536 | 536 | ||
537 | iwl_write_direct32(priv, HBUS_TARG_MBX_C, | 537 | iwl_write_direct32(bus(priv), HBUS_TARG_MBX_C, |
538 | HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED); | 538 | HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED); |
539 | 539 | ||
540 | if (!(flags & RXON_CARD_DISABLED)) { | 540 | if (!(flags & RXON_CARD_DISABLED)) { |
541 | iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, | 541 | iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_CLR, |
542 | CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); | 542 | CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); |
543 | iwl_write_direct32(priv, HBUS_TARG_MBX_C, | 543 | iwl_write_direct32(bus(priv), HBUS_TARG_MBX_C, |
544 | HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED); | 544 | HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED); |
545 | } | 545 | } |
546 | if (flags & CT_CARD_DISABLED) | 546 | if (flags & CT_CARD_DISABLED) |