diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-06 13:34:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-06 13:34:15 -0700 |
| commit | a25a32ab71f822efb3e6025c365caa678aa6ff3b (patch) | |
| tree | fcbc495baddf6d1837034cb83ee837887ea648f6 /drivers/net/wireless/iwlwifi/iwl-eeprom.h | |
| parent | ec80bfcb68a0c46443991991d459a0cde773cdea (diff) | |
| parent | 3d7dc7e8c1566acb0fc55df228b2ed91f5638e9d (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 | 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 98aa8af0119..20b66469d68 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) |