diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-06-30 13:34:06 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-30 13:34:06 -0400 |
commit | df2cbe40753dc36af294c30209ed909869aca6cf (patch) | |
tree | 39eb7e8e06737b295007126f4e16c1b688427163 /drivers/net/wireless/iwlwifi/iwl-1000.c | |
parent | myri10ge: Update MAINTAINERS (diff) | |
parent | rtlwifi: potential forever loop in rtl92de_hw_init() (diff) | |
download | linux-dev-df2cbe40753dc36af294c30209ed909869aca6cf.tar.xz linux-dev-df2cbe40753dc36af294c30209ed909869aca6cf.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index 2daca80f086f..e57fad9f1f09 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c @@ -34,6 +34,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" @@ -53,10 +54,10 @@ #define IWL100_UCODE_API_MIN 5 #define IWL1000_FW_PRE "iwlwifi-1000-" -#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE #api ".ucode" +#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE __stringify(api) ".ucode" #define IWL100_FW_PRE "iwlwifi-100-" -#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE #api ".ucode" +#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE __stringify(api) ".ucode" /* |