diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
| commit | e300d955debdadf599c36e47eb0bc16f5976215c (patch) | |
| tree | 8fafcc789dc06e90665e6eee6388af228bbd2fd7 /drivers/net/wireless/iwlwifi/iwl-eeprom.h | |
| parent | 242647bcf8464860f173f3d4d4ab3490d3558518 (diff) | |
| parent | 815868e7b5c207ba42d5b317ccc51f8112732268 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h index 5488006491a2..3452dfa7b571 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h | |||
| @@ -276,6 +276,10 @@ struct iwl_eeprom_enhanced_txpwr { | |||
| 276 | #define EEPROM_6050_TX_POWER_VERSION (4) | 276 | #define EEPROM_6050_TX_POWER_VERSION (4) |
| 277 | #define EEPROM_6050_EEPROM_VERSION (0x532) | 277 | #define EEPROM_6050_EEPROM_VERSION (0x532) |
| 278 | 278 | ||
| 279 | /* 6x50g2 Specific */ | ||
| 280 | #define EEPROM_6050G2_TX_POWER_VERSION (6) | ||
| 281 | #define EEPROM_6050G2_EEPROM_VERSION (0x553) | ||
| 282 | |||
| 279 | /* 6x00g2 Specific */ | 283 | /* 6x00g2 Specific */ |
| 280 | #define EEPROM_6000G2_TX_POWER_VERSION (6) | 284 | #define EEPROM_6000G2_TX_POWER_VERSION (6) |
| 281 | #define EEPROM_6000G2_EEPROM_VERSION (0x709) | 285 | #define EEPROM_6000G2_EEPROM_VERSION (0x709) |