diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-04-18 09:41:45 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-04-18 09:41:45 +0300 |
| commit | d074e0b84ac577655d7f4d3cd9b20065db1def30 (patch) | |
| tree | cace25a04169a6e9db4d289b54c68568245e8491 /drivers/net/wireless/intel/iwlwifi/Makefile | |
| parent | 1f242a3de702d5a19c479685d35b050837122724 (diff) | |
| parent | 87d0e1af9db3bff4ec2f68fd4d032f89c23867a4 (diff) | |
Merge tag 'iwlwifi-next-for-kalle-2017-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Patches intended for v4.12:
* Some small fixes here and there;
* The usual cleanups and small improvements;
* Work to support A000 devices continues;
* New FW API version;
* Some debugging improvements;
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/Makefile')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/Makefile b/drivers/net/wireless/intel/iwlwifi/Makefile index 92e611841200..b27bcac8f5db 100644 --- a/drivers/net/wireless/intel/iwlwifi/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/Makefile @@ -7,6 +7,7 @@ iwlwifi-objs += iwl-notif-wait.o iwlwifi-objs += iwl-eeprom-read.o iwl-eeprom-parse.o iwlwifi-objs += iwl-phy-db.o iwl-nvm-parse.o iwlwifi-objs += pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o +iwlwifi-objs += pcie/ctxt-info.o pcie/trans-gen2.o iwlwifi-$(CONFIG_IWLDVM) += iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o iwl-8000.o iwl-9000.o iwl-a000.o iwlwifi-objs += iwl-trans.o |