diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
| commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
| tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /drivers/net/wireless/iwlwifi/iwl-eeprom.h | |
| parent | 30ba3ead05763b172acaa65ae1be71af2a878940 (diff) | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
Merge commit 'v2.6.34' into next
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 4e1ba824dc50..8171c701e4e1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h | |||
| @@ -203,6 +203,10 @@ struct iwl_eeprom_enhanced_txpwr { | |||
| 203 | #define EEPROM_5000_REG_BAND_52_HT40_CHANNELS ((0x92)\ | 203 | #define EEPROM_5000_REG_BAND_52_HT40_CHANNELS ((0x92)\ |
| 204 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */ | 204 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */ |
| 205 | 205 | ||
| 206 | /* 6000 regulatory - indirect access */ | ||
| 207 | #define EEPROM_6000_REG_BAND_24_HT40_CHANNELS ((0x80)\ | ||
| 208 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 14 bytes */ | ||
| 209 | |||
| 206 | /* 6000 and up regulatory tx power - indirect access */ | 210 | /* 6000 and up regulatory tx power - indirect access */ |
| 207 | /* max. elements per section */ | 211 | /* max. elements per section */ |
| 208 | #define EEPROM_MAX_TXPOWER_SECTION_ELEMENTS (8) | 212 | #define EEPROM_MAX_TXPOWER_SECTION_ELEMENTS (8) |