diff options
| author | John W. Linville | 2011-06-28 19:53:32 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-06-28 19:56:21 +0200 |
| commit | 3be3fdb58ad22f67c5fd12548c88cefe3f726588 (patch) | |
| tree | 0c5c4e509c37098671df55a20b7e9aadb3d74db8 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
| parent | mac80211: dynamic PS - don't enter PS when TX frames are pending (diff) | |
| parent | iwlagn: use PCI_DMA_* for pci_* operations (diff) | |
| download | kernel-qcow2-linux-3be3fdb58ad22f67c5fd12548c88cefe3f726588.tar.gz kernel-qcow2-linux-3be3fdb58ad22f67c5fd12548c88cefe3f726588.tar.xz kernel-qcow2-linux-3be3fdb58ad22f67c5fd12548c88cefe3f726588.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-tx.c
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 937a8f12afa7..269dfdb9fe1a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c @@ -35,6 +35,7 @@ #include <net/mac80211.h> #include <linux/etherdevice.h> #include <asm/unaligned.h> +#include <linux/stringify.h> #include "iwl-eeprom.h" #include "iwl-dev.h" @@ -55,10 +56,10 @@ #define IWL5150_UCODE_API_MIN 1 #define IWL5000_FW_PRE "iwlwifi-5000-" -#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE #api ".ucode" +#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE __stringify(api) ".ucode" #define IWL5150_FW_PRE "iwlwifi-5150-" -#define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE #api ".ucode" +#define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE __stringify(api) ".ucode" /* NIC configuration for 5000 series */ static void iwl5000_nic_config(struct iwl_priv *priv) |