Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17d9aa66 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2017-06-30' of... 

Merge tag 'iwlwifi-next-for-kalle-2017-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Final set of patches for 4.13

* Some important fixes for 9000 HW;
* FW API changes for the upcoming -30 ucode release;
* A few new PCI IDs for 9000 series;
* Reorganization of common files;
* Some more fixes and improvements here and there
* Initialization and other important fixes for 9000 series;
* Support for version 30 of the FW API for 8000 and 9000 series;
parents 8a063a27 ba320dd6

drivers/net/wireless/intel/iwlwifi/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ obj-$(CONFIG_IWLWIFI) += iwlwifi.o 
iwlwifi-objs		+= iwl-io.o

iwlwifi-objs		+= iwl-drv.o

iwlwifi-objs		+= iwl-debug.o

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 pcie/tx-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-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o

iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/a000.o

iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= fw/notif-wait.o



iwlwifi-objs += $(iwlwifi-m)