diff options
author | Winkler, Tomas <tomas.winkler@intel.com> | 2008-11-19 18:32:25 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-26 09:47:38 -0500 |
commit | 25e35a56d5f4795cf52cdd0830a91e3103396cfe (patch) | |
tree | 2f41caa7b84299c14fba9b33d324bbf4b34ffbe3 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | 201706ac0b1ab6df5343119883964ec7272844b0 (diff) |
iwlwifi: 4965 define firmware file name once
Apply same idiom as in 5000 introduced by
'iwlwifi: define firmware file name once'
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 9007ff2348d3..b96f55341384 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -53,6 +53,7 @@ static int iwl4965_hw_get_temperature(const struct iwl_priv *priv); | |||
53 | * is not compatible with earlier drivers. | 53 | * is not compatible with earlier drivers. |
54 | * This number will also appear in << 8 position of 1st dword of uCode file */ | 54 | * This number will also appear in << 8 position of 1st dword of uCode file */ |
55 | #define IWL4965_UCODE_API "-2" | 55 | #define IWL4965_UCODE_API "-2" |
56 | #define IWL4965_MODULE_FIRMWARE "iwlwifi-4965" IWL4965_UCODE_API ".ucode" | ||
56 | 57 | ||
57 | 58 | ||
58 | /* module parameters */ | 59 | /* module parameters */ |
@@ -2322,7 +2323,7 @@ static struct iwl_ops iwl4965_ops = { | |||
2322 | 2323 | ||
2323 | struct iwl_cfg iwl4965_agn_cfg = { | 2324 | struct iwl_cfg iwl4965_agn_cfg = { |
2324 | .name = "4965AGN", | 2325 | .name = "4965AGN", |
2325 | .fw_name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode", | 2326 | .fw_name = IWL4965_MODULE_FIRMWARE, |
2326 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | 2327 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, |
2327 | .eeprom_size = IWL4965_EEPROM_IMG_SIZE, | 2328 | .eeprom_size = IWL4965_EEPROM_IMG_SIZE, |
2328 | .eeprom_ver = EEPROM_4965_EEPROM_VERSION, | 2329 | .eeprom_ver = EEPROM_4965_EEPROM_VERSION, |
@@ -2332,7 +2333,7 @@ struct iwl_cfg iwl4965_agn_cfg = { | |||
2332 | }; | 2333 | }; |
2333 | 2334 | ||
2334 | /* Module firmware */ | 2335 | /* Module firmware */ |
2335 | MODULE_FIRMWARE("iwlwifi-4965" IWL4965_UCODE_API ".ucode"); | 2336 | MODULE_FIRMWARE(IWL4965_MODULE_FIRMWARE); |
2336 | 2337 | ||
2337 | module_param_named(antenna, iwl4965_mod_params.antenna, int, 0444); | 2338 | module_param_named(antenna, iwl4965_mod_params.antenna, int, 0444); |
2338 | MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); | 2339 | MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); |