diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-05-11 20:54:07 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-05-11 20:54:07 +0300 |
| commit | 2befc4e003a6093db8dce34c7dc9dee8426c973b (patch) | |
| tree | 9c6ddb29aa390dc671b7c68dd2b4e6bb1264204d /drivers/net/wireless/intel/iwlwifi/iwl-7000.c | |
| parent | 251a9605ab882998009002bf1f5176a049beba53 (diff) | |
| parent | af5e964f3045b66f1cd720b9c5abd37e47e613e2 (diff) | |
Merge tag 'iwlwifi-next-for-kalle-2016-05-10' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* work for RX multiqueue continues (Sara);
* dynamic queue allocation work continues (Liad);
* add Luca as maintainer;
* a bunch of fixes and improvements all over;
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-7000.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c index abd2904ecc48..f4d92155fa76 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c @@ -122,7 +122,6 @@ static const struct iwl_base_params iwl7000_base_params = { .eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_7000, .num_of_queues = 31, - .pll_cfg_val = 0, .shadow_ram_support = true, .led_compensation = 57, .wd_timeout = IWL_LONG_WD_TIMEOUT, |