diff options
| author | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
| commit | caa70ccf8cc719acb0540b558b4e075796778db8 (patch) | |
| tree | e8173307b04eca62168415be04e7800bdf011f80 /drivers/net/wireless/iwlwifi/iwl-eeprom.h | |
| parent | 56d667f87e81d15d43f264007322f1179ce1722e (diff) | |
| parent | 3ec10cd8b526c6b10170c2649002672ee2019e73 (diff) | |
Merge branch 'linux-linaro-2.6.38-master' into for-ubuntuu2
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 9e6f31355ee..c0cd307dc2e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h @@ -241,7 +241,7 @@ struct iwl_eeprom_enhanced_txpwr { /* 6x00 Specific */ #define EEPROM_6000_TX_POWER_VERSION (4) -#define EEPROM_6000_EEPROM_VERSION (0x434) +#define EEPROM_6000_EEPROM_VERSION (0x423) /* 6x50 Specific */ #define EEPROM_6050_TX_POWER_VERSION (4) |