diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-18 14:04:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-18 14:04:51 -0400 |
| commit | 9d1059c2481885ba7a2af02fc1bf87cae88b302a (patch) | |
| tree | b9ff1d502017ea7939d26a99720801ffdbe2b3da /drivers/net/wireless/iwlwifi/iwl-drv.c | |
| parent | c4d827c5ccc3a49227dbf9d4b248a2e86f388023 (diff) | |
| parent | fcb3701849957917a234a61b58ad70ed35c83eda (diff) | |
| download | op-kernel-dev-9d1059c2481885ba7a2af02fc1bf87cae88b302a.zip op-kernel-dev-9d1059c2481885ba7a2af02fc1bf87cae88b302a.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-drv.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index 4f88613..2f690e5 100644 --- 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; |
