projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
[linux-2.6-microblaze.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-drv.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-drv.c
b/drivers/net/wireless/iwlwifi/iwl-drv.c
index
4f88613
..
2f690e5
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-drv.c
@@
-1000,10
+1000,12
@@
static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
*/
if (load_module) {
err = request_module("%s", op->name);
+#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR
if (err)
IWL_ERR(drv,
"failed to load module %s (error %d), is dynamic loading enabled?\n",
op->name, err);
+#endif
}
return;