diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-csr.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 99c08ea6ddf9..b1b7363bfdd4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -618,8 +618,8 @@ int iwl4965_hw_nic_init(struct iwl_priv *priv) | |||
618 | 618 | ||
619 | iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG, | 619 | iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG, |
620 | CSR49_HW_IF_CONFIG_REG_BIT_4965_R | | 620 | CSR49_HW_IF_CONFIG_REG_BIT_4965_R | |
621 | CSR49_HW_IF_CONFIG_REG_BIT_RADIO_SI | | 621 | CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI | |
622 | CSR49_HW_IF_CONFIG_REG_BIT_MAC_SI); | 622 | CSR_HW_IF_CONFIG_REG_BIT_MAC_SI); |
623 | 623 | ||
624 | ret = iwl_grab_nic_access(priv); | 624 | ret = iwl_grab_nic_access(priv); |
625 | if (ret < 0) { | 625 | if (ret < 0) { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h index df9949ad3f61..f8de32b1d421 100644 --- a/drivers/net/wireless/iwlwifi/iwl-csr.h +++ b/drivers/net/wireless/iwlwifi/iwl-csr.h | |||
@@ -106,9 +106,9 @@ | |||
106 | 106 | ||
107 | /* Bits for CSR_HW_IF_CONFIG_REG */ | 107 | /* Bits for CSR_HW_IF_CONFIG_REG */ |
108 | #define CSR49_HW_IF_CONFIG_REG_BIT_4965_R (0x00000010) | 108 | #define CSR49_HW_IF_CONFIG_REG_BIT_4965_R (0x00000010) |
109 | #define CSR49_HW_IF_CONFIG_REG_MSK_BOARD_VER (0x00000C00) | 109 | #define CSR_HW_IF_CONFIG_REG_MSK_BOARD_VER (0x00000C00) |
110 | #define CSR49_HW_IF_CONFIG_REG_BIT_MAC_SI (0x00000100) | 110 | #define CSR_HW_IF_CONFIG_REG_BIT_MAC_SI (0x00000100) |
111 | #define CSR49_HW_IF_CONFIG_REG_BIT_RADIO_SI (0x00000200) | 111 | #define CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI (0x00000200) |
112 | 112 | ||
113 | #define CSR39_HW_IF_CONFIG_REG_BIT_3945_MB (0x00000100) | 113 | #define CSR39_HW_IF_CONFIG_REG_BIT_3945_MB (0x00000100) |
114 | #define CSR39_HW_IF_CONFIG_REG_BIT_3945_MM (0x00000200) | 114 | #define CSR39_HW_IF_CONFIG_REG_BIT_3945_MM (0x00000200) |