diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-10-27 10:31:44 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-10-27 10:31:44 +0200 |
commit | 6856b8e53609ee3eff7e3173e4e5d979f47d834d (patch) | |
tree | c2f9e364889fa07e20081b198a085a4ed7b26bd3 /drivers/net/wireless/intel/iwlwifi/cfg/8000.c | |
parent | 57646b6fda9b751e62929c73b1e6df06b108a3c9 (diff) | |
parent | 2eece390bf68ec8f733d7e4a3ba8a5ea350082ae (diff) |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/cfg/8000.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/cfg/8000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c index 2e6c52664cee..c2a5936ccede 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c @@ -164,7 +164,7 @@ static const struct iwl_tt_params iwl8000_tt_params = { .default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C, \ .thermal_params = &iwl8000_tt_params, \ .apmg_not_supported = true, \ - .ext_nvm = true, \ + .nvm_type = IWL_NVM_EXT, \ .dbgc_supported = true #define IWL_DEVICE_8000 \ |