diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 28 | 
1 files changed, 18 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index f8c710db6e6..fda6fe08cf9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c @@ -603,19 +603,27 @@ struct iwl_cfg iwl6050_2abg_cfg = {  	IWL_DEVICE_6050,  }; +#define IWL_DEVICE_6150						\ +	.fw_name_pre = IWL6050_FW_PRE,				\ +	.ucode_api_max = IWL6050_UCODE_API_MAX,			\ +	.ucode_api_min = IWL6050_UCODE_API_MIN,			\ +	.ops = &iwl6150_ops,					\ +	.eeprom_ver = EEPROM_6150_EEPROM_VERSION,		\ +	.eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,	\ +	.base_params = &iwl6050_base_params,			\ +	.need_dc_calib = true,					\ +	.led_mode = IWL_LED_BLINK,				\ +	.internal_wimax_coex = true +  struct iwl_cfg iwl6150_bgn_cfg = {  	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN", -	.fw_name_pre = IWL6050_FW_PRE, -	.ucode_api_max = IWL6050_UCODE_API_MAX, -	.ucode_api_min = IWL6050_UCODE_API_MIN, -	.eeprom_ver = EEPROM_6150_EEPROM_VERSION, -	.eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION, -	.ops = &iwl6150_ops, -	.base_params = &iwl6050_base_params, +	IWL_DEVICE_6150,  	.ht_params = &iwl6000_ht_params, -	.need_dc_calib = true, -	.led_mode = IWL_LED_RF_STATE, -	.internal_wimax_coex = true, +}; + +struct iwl_cfg iwl6150_bg_cfg = { +	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BG", +	IWL_DEVICE_6150,  };  struct iwl_cfg iwl6000_3agn_cfg = {  |