diff options
| author | root <root@wtplsrv02.(none)> | 2011-03-28 19:12:43 -0400 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-08 10:59:01 -0400 |
| commit | 1d5cc5559aaf5273cc1f9aac9b428e3a99d41de6 (patch) | |
| tree | 0c2285f9d31d31075f2bdbb68dfeb278dac22a03 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
| parent | b37e3b6d64358604960b35e8ecbb7aed22e0926e (diff) | |
iwlwifi: remove extranious macro from firmware define
define of firmware filenames use extra macro to build the files name.
Signed-off-by: Jay Sternberg <jay.e.sternberg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 66f5fe8fe1ac..4dafc58800d9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
| @@ -59,12 +59,10 @@ | |||
| 59 | #define IWL5150_UCODE_API_MIN 1 | 59 | #define IWL5150_UCODE_API_MIN 1 |
| 60 | 60 | ||
| 61 | #define IWL5000_FW_PRE "iwlwifi-5000-" | 61 | #define IWL5000_FW_PRE "iwlwifi-5000-" |
| 62 | #define _IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE #api ".ucode" | 62 | #define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE #api ".ucode" |
| 63 | #define IWL5000_MODULE_FIRMWARE(api) _IWL5000_MODULE_FIRMWARE(api) | ||
| 64 | 63 | ||
| 65 | #define IWL5150_FW_PRE "iwlwifi-5150-" | 64 | #define IWL5150_FW_PRE "iwlwifi-5150-" |
| 66 | #define _IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE #api ".ucode" | 65 | #define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE #api ".ucode" |
| 67 | #define IWL5150_MODULE_FIRMWARE(api) _IWL5150_MODULE_FIRMWARE(api) | ||
| 68 | 66 | ||
| 69 | /* NIC configuration for 5000 series */ | 67 | /* NIC configuration for 5000 series */ |
| 70 | static void iwl5000_nic_config(struct iwl_priv *priv) | 68 | static void iwl5000_nic_config(struct iwl_priv *priv) |