diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-07 16:45:40 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-07 16:45:40 -0400 |
| commit | b37e3b6d64358604960b35e8ecbb7aed22e0926e (patch) | |
| tree | f9673afc2332c15a989d3b32f002363a92ea66e1 /drivers/net/wireless/iwlwifi/iwl-eeprom.h | |
| parent | a90c7a313a1c5b4fc99f987a2ae8f92ab0ae35c7 (diff) | |
| parent | bd39a274fb7b43374c797bafdb7f506598f36f77 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/rtlwifi/efuse.c
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
net/bluetooth/mgmt.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h index 6b4343bd4bd..0e9d9703636 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h | |||
| @@ -215,7 +215,7 @@ struct iwl_eeprom_enhanced_txpwr { | |||
| 215 | 215 | ||
| 216 | /* 6x00 Specific */ | 216 | /* 6x00 Specific */ |
| 217 | #define EEPROM_6000_TX_POWER_VERSION (4) | 217 | #define EEPROM_6000_TX_POWER_VERSION (4) |
| 218 | #define EEPROM_6000_EEPROM_VERSION (0x434) | 218 | #define EEPROM_6000_EEPROM_VERSION (0x423) |
| 219 | 219 | ||
| 220 | /* 6x50 Specific */ | 220 | /* 6x50 Specific */ |
| 221 | #define EEPROM_6050_TX_POWER_VERSION (4) | 221 | #define EEPROM_6050_TX_POWER_VERSION (4) |