diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-01 04:52:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-01 04:52:02 -0400 |
| commit | 60c2ce2b4facf28f569115a55e1f479eb12bd0f1 (patch) | |
| tree | 9771312021bbece80efea2fb0823563e4f68b611 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
| parent | 0e90ed0e8b9b1c25040442f1d20c799751b1e727 (diff) | |
| parent | 690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index f99f9c193352..e816c27db794 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <net/mac80211.h> | 37 | #include <net/mac80211.h> |
| 38 | #include <linux/etherdevice.h> | 38 | #include <linux/etherdevice.h> |
| 39 | #include <asm/unaligned.h> | 39 | #include <asm/unaligned.h> |
| 40 | #include <linux/stringify.h> | ||
| 40 | 41 | ||
| 41 | #include "iwl-eeprom.h" | 42 | #include "iwl-eeprom.h" |
| 42 | #include "iwl-dev.h" | 43 | #include "iwl-dev.h" |
| @@ -57,10 +58,10 @@ | |||
| 57 | #define IWL5150_UCODE_API_MIN 1 | 58 | #define IWL5150_UCODE_API_MIN 1 |
| 58 | 59 | ||
| 59 | #define IWL5000_FW_PRE "iwlwifi-5000-" | 60 | #define IWL5000_FW_PRE "iwlwifi-5000-" |
| 60 | #define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE #api ".ucode" | 61 | #define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE __stringify(api) ".ucode" |
| 61 | 62 | ||
| 62 | #define IWL5150_FW_PRE "iwlwifi-5150-" | 63 | #define IWL5150_FW_PRE "iwlwifi-5150-" |
| 63 | #define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE #api ".ucode" | 64 | #define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE __stringify(api) ".ucode" |
| 64 | 65 | ||
| 65 | /* NIC configuration for 5000 series */ | 66 | /* NIC configuration for 5000 series */ |
| 66 | static void iwl5000_nic_config(struct iwl_priv *priv) | 67 | static void iwl5000_nic_config(struct iwl_priv *priv) |