diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-29 13:41:25 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-29 13:41:25 -0800 |
commit | 4a80f2788952055a627f2093a0174537d70aec1b (patch) | |
tree | 411c8ec555fe85cf9faa9da90e62ab781b33661c /drivers/net/wireless/iwlwifi/iwl-4965-hw.h | |
parent | 03a64c93b68e1eff299b9bbbb0d13105171cddc4 (diff) | |
parent | e4861829072c61883114c64a3af61f305a789ff0 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965-hw.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h index ffe1e9dfdec..cc726215ab9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h +++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h @@ -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 */ |