diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-10-16 17:06:54 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-10-16 17:09:24 +0300 |
| commit | 0fac9e2dff00a2344ffc81d82749181ffae408a2 (patch) | |
| tree | 1399ce5ce12955c971c4727dd70bc8b4db2754f1 /drivers/net/wireless/intel/iwlwifi/cfg/a000.c | |
| parent | a39644b235c1a45f84d6e16603cacb93740ed2d4 (diff) | |
| parent | a6127b4440d1f74f26b64006b2f50c9dc6d66efc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/cfg/a000.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/a000.c b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c index 076f8d6d1124..c911d55fde49 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/a000.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c @@ -133,7 +133,7 @@ static const struct iwl_ht_params iwl_a000_ht_params = { .use_tfh = true, \ .rf_id = true, \ .gen2 = true, \ - .ext_nvm = true, \ + .nvm_type = IWL_NVM_EXT, \ .dbgc_supported = true, \ .tx_cmd_queue_size = 32 |