diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-23 14:43:45 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-23 14:43:45 -0400 |
| commit | 3b51cc996e81d8a113416d8094fa4a88f8360a51 (patch) | |
| tree | e75b98b228bb4e456c30673fcc4b56ffa1d09cf5 /drivers/net/wireless/wl12xx/wl1251_reg.h | |
| parent | c68ed255265968c3948fa2678bf59d15c471b055 (diff) | |
| parent | 672724403b42da1d276c6cf811e8e34d15efd964 (diff) | |
Merge branch 'master' into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/phy.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_reg.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_reg.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_reg.h b/drivers/net/wireless/wl12xx/wl1251_reg.h index 0ca3b4326056..d16edd9bf06c 100644 --- a/drivers/net/wireless/wl12xx/wl1251_reg.h +++ b/drivers/net/wireless/wl12xx/wl1251_reg.h | |||
| @@ -46,7 +46,14 @@ | |||
| 46 | #define SOR_CFG (REGISTERS_BASE + 0x0800) | 46 | #define SOR_CFG (REGISTERS_BASE + 0x0800) |
| 47 | #define ECPU_CTRL (REGISTERS_BASE + 0x0804) | 47 | #define ECPU_CTRL (REGISTERS_BASE + 0x0804) |
| 48 | #define HI_CFG (REGISTERS_BASE + 0x0808) | 48 | #define HI_CFG (REGISTERS_BASE + 0x0808) |
| 49 | |||
| 50 | /* EEPROM registers */ | ||
| 49 | #define EE_START (REGISTERS_BASE + 0x080C) | 51 | #define EE_START (REGISTERS_BASE + 0x080C) |
| 52 | #define EE_CTL (REGISTERS_BASE + 0x2000) | ||
| 53 | #define EE_DATA (REGISTERS_BASE + 0x2004) | ||
| 54 | #define EE_ADDR (REGISTERS_BASE + 0x2008) | ||
| 55 | |||
| 56 | #define EE_CTL_READ 2 | ||
| 50 | 57 | ||
| 51 | #define CHIP_ID_B (REGISTERS_BASE + 0x5674) | 58 | #define CHIP_ID_B (REGISTERS_BASE + 0x5674) |
| 52 | 59 | ||