diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index af97e0bdf483..d362c4c82db2 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -95,11 +95,6 @@ int iwl4965_param_amsdu_size_8K; /* def: enable 8K amsdu size */ | |||
95 | #define DRV_COPYRIGHT "Copyright(c) 2003-2007 Intel Corporation" | 95 | #define DRV_COPYRIGHT "Copyright(c) 2003-2007 Intel Corporation" |
96 | #define DRV_VERSION IWLWIFI_VERSION | 96 | #define DRV_VERSION IWLWIFI_VERSION |
97 | 97 | ||
98 | /* Change firmware file name, using "-" and incrementing number, | ||
99 | * *only* when uCode interface or architecture changes so that it | ||
100 | * is not compatible with earlier drivers. | ||
101 | * This number will also appear in << 8 position of 1st dword of uCode file */ | ||
102 | #define IWL4965_UCODE_API "-1" | ||
103 | 98 | ||
104 | MODULE_DESCRIPTION(DRV_DESCRIPTION); | 99 | MODULE_DESCRIPTION(DRV_DESCRIPTION); |
105 | MODULE_VERSION(DRV_VERSION); | 100 | MODULE_VERSION(DRV_VERSION); |
@@ -6019,7 +6014,7 @@ static int iwl4965_read_ucode(struct iwl4965_priv *priv) | |||
6019 | struct iwl4965_ucode *ucode; | 6014 | struct iwl4965_ucode *ucode; |
6020 | int ret; | 6015 | int ret; |
6021 | const struct firmware *ucode_raw; | 6016 | const struct firmware *ucode_raw; |
6022 | const char *name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode"; | 6017 | const char *name = priv->cfg->fw_name; |
6023 | u8 *src; | 6018 | u8 *src; |
6024 | size_t len; | 6019 | size_t len; |
6025 | u32 ver, inst_size, data_size, init_size, init_data_size, boot_size; | 6020 | u32 ver, inst_size, data_size, init_size, init_data_size, boot_size; |