diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-11 22:48:32 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-11 22:48:32 +0400 |
| commit | 3899ba90a4ab2f3cab8e0f91a76c14ff131c8293 (patch) | |
| tree | ae82b469f8a7ceb42547d11dd1fe5c73abc8635b /drivers/net/wireless/iwlwifi/mvm/Makefile | |
| parent | 45203a3b380cee28f570475c0d28c169f908c209 (diff) | |
| parent | 8b3e7be437a6b62118d0485ad971e724afe23fdf (diff) | |
| download | linux-3899ba90a4ab2f3cab8e0f91a76c14ff131c8293.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/debug.c
net/mac80211/iface.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/Makefile')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/Makefile b/drivers/net/wireless/iwlwifi/mvm/Makefile index 2acc44b40986..ff856e543ae8 100644 --- a/drivers/net/wireless/iwlwifi/mvm/Makefile +++ b/drivers/net/wireless/iwlwifi/mvm/Makefile @@ -3,7 +3,7 @@ iwlmvm-y += fw.o mac80211.o nvm.o ops.o phy-ctxt.o mac-ctxt.o iwlmvm-y += utils.o rx.o tx.o binding.o quota.o sta.o iwlmvm-y += scan.o time-event.o rs.o iwlmvm-y += power.o bt-coex.o -iwlmvm-y += led.o +iwlmvm-y += led.o tt.o iwlmvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o iwlmvm-$(CONFIG_PM_SLEEP) += d3.o |