diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-20 20:57:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-20 20:57:56 -0400 |
| commit | e46754f8c9333170f11780d8e3a70da1b1a88338 (patch) | |
| tree | 9b7ac1c7cb4c147c69767908c6dcb7633fb03f12 /drivers/net/wireless/iwlwifi/iwl-eeprom.h | |
| parent | ef9e83c1ab2981769f16e626179dd56895041b38 (diff) | |
| parent | fe6f212ce12341df18ef9b890bea739b4547157b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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) |