diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/2000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/2000.c | 18 | 
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/2000.c b/drivers/net/wireless/iwlwifi/pcie/2000.c index 9fbde32f755..e7de33128b1 100644 --- a/drivers/net/wireless/iwlwifi/pcie/2000.c +++ b/drivers/net/wireless/iwlwifi/pcie/2000.c @@ -1,6 +1,6 @@  /******************************************************************************   * - * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved. + * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.   *   * This program is free software; you can redistribute it and/or modify it   * under the terms of version 2 of the GNU General Public License as @@ -138,8 +138,8 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = {  	.device_family = IWL_DEVICE_FAMILY_2000,		\  	.max_inst_size = IWL60_RTC_INST_SIZE,			\  	.max_data_size = IWL60_RTC_DATA_SIZE,			\ -	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\ -	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\ +	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\ +	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\  	.base_params = &iwl2000_base_params,			\  	.eeprom_params = &iwl20x0_eeprom_params,		\  	.need_temp_offset_calib = true,				\ @@ -166,8 +166,8 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = {  	.device_family = IWL_DEVICE_FAMILY_2030,		\  	.max_inst_size = IWL60_RTC_INST_SIZE,			\  	.max_data_size = IWL60_RTC_DATA_SIZE,			\ -	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\ -	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\ +	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\ +	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\  	.base_params = &iwl2030_base_params,			\  	.bt_params = &iwl2030_bt_params,			\  	.eeprom_params = &iwl20x0_eeprom_params,		\ @@ -190,8 +190,8 @@ const struct iwl_cfg iwl2030_2bgn_cfg = {  	.device_family = IWL_DEVICE_FAMILY_105,			\  	.max_inst_size = IWL60_RTC_INST_SIZE,			\  	.max_data_size = IWL60_RTC_DATA_SIZE,			\ -	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\ -	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\ +	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\ +	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\  	.base_params = &iwl2000_base_params,			\  	.eeprom_params = &iwl20x0_eeprom_params,		\  	.need_temp_offset_calib = true,				\ @@ -220,8 +220,8 @@ const struct iwl_cfg iwl105_bgn_d_cfg = {  	.device_family = IWL_DEVICE_FAMILY_135,			\  	.max_inst_size = IWL60_RTC_INST_SIZE,			\  	.max_data_size = IWL60_RTC_DATA_SIZE,			\ -	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\ -	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\ +	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\ +	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\  	.base_params = &iwl2030_base_params,			\  	.bt_params = &iwl2030_bt_params,			\  	.eeprom_params = &iwl20x0_eeprom_params,		\  |