iwlwifi: remove twice defined CSR register
authorTomas Winkler <tomas.winkler@intel.com>
Tue, 19 Feb 2008 22:05:33 +0000 (14:05 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Feb 2008 20:37:13 +0000 (15:37 -0500)
This patch removes twice defined CSR register. It was confusing

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-3945-hw.h
drivers/net/wireless/iwlwifi/iwl-4965-hw.h
drivers/net/wireless/iwlwifi/iwl-4965.c

index 571815d7e8bf8909327e07f07453fd36396883e2..6693767adc9f4616b5533d8820df58cd1fd6e52e 100644 (file)
@@ -324,7 +324,6 @@ struct iwl3945_eeprom {
 /*=== CSR (control and status registers) ===*/
 #define CSR_BASE    (0x000)
 
-#define CSR_SW_VER              (CSR_BASE+0x000)
 #define CSR_HW_IF_CONFIG_REG    (CSR_BASE+0x000) /* hardware interface config */
 #define CSR_INT_COALESCING      (CSR_BASE+0x004) /* accum ints, 32-usec units */
 #define CSR_INT                 (CSR_BASE+0x008) /* host interrupt status/ack */
index ffe1e9dfdec7bc5da5b2e0c909a41f7f710c4a8d..cc726215ab93f4312babfdb93929d301f2ebd911 100644 (file)
@@ -413,7 +413,6 @@ struct iwl4965_eeprom {
 /*=== CSR (control and status registers) ===*/
 #define CSR_BASE    (0x000)
 
-#define CSR_SW_VER              (CSR_BASE+0x000)
 #define CSR_HW_IF_CONFIG_REG    (CSR_BASE+0x000) /* hardware interface config */
 #define CSR_INT_COALESCING      (CSR_BASE+0x004) /* accum ints, 32-usec units */
 #define CSR_INT                 (CSR_BASE+0x008) /* host interrupt status/ack */
index 237d3b24dd200a0bf1d2b4858bcc9d0a8435b244..a9c30bcb65b85393d18532c53beab31645fe325d 100644 (file)
@@ -545,9 +545,10 @@ int iwl4965_hw_nic_init(struct iwl4965_priv *priv)
 
        /* set CSR_HW_CONFIG_REG for uCode use */
 
-       iwl4965_set_bit(priv, CSR_SW_VER, CSR_HW_IF_CONFIG_REG_BIT_KEDRON_R |
-                   CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
-                   CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
+       iwl4965_set_bit(priv, CSR_HW_IF_CONFIG_REG,
+                       CSR_HW_IF_CONFIG_REG_BIT_KEDRON_R |
+                       CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
+                       CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
 
        rc = iwl4965_grab_nic_access(priv);
        if (rc < 0) {