diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:33 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:33 +0300 |
| commit | 939ecf6b14c46e3448411a934418311b492bfee4 (patch) | |
| tree | 7fb5ed10ab3e3adb494bf7a0119a3b543cea3719 /drivers/net/wireless/iwlwifi/iwl-7000.c | |
| parent | e03bbb62cfdf539ae8110b297493c685f9d12774 (diff) | |
| parent | 8e96440e8d42da0dab02cae125ea59e2b64c77fe (diff) | |
| download | blackbird-op-linux-939ecf6b14c46e3448411a934418311b492bfee4.tar.gz blackbird-op-linux-939ecf6b14c46e3448411a934418311b492bfee4.zip | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-7000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-7000.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c index 2c9b6fb45603..f73de239cdc1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-7000.c +++ b/drivers/net/wireless/iwlwifi/iwl-7000.c @@ -245,3 +245,4 @@ const struct iwl_cfg iwl7265_n_cfg = { MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK)); MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK)); +MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK)); |
