diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-03-20 15:24:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-03-20 15:24:57 -0400 |
commit | 5470b462c3f0c6fa980c320968a165bd0f34ca8d (patch) | |
tree | eb20de947bec8133d27f97f7af8ae4cf35def663 /drivers/net/wireless/brcm80211/brcmfmac/Makefile | |
parent | net: fix psock_fanout selftest bind error message (diff) | |
parent | ath6kl: fix size_t printf warnings (diff) | |
download | linux-dev-5470b462c3f0c6fa980c320968a165bd0f34ca8d.tar.xz linux-dev-5470b462c3f0c6fa980c320968a165bd0f34ca8d.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/Makefile')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile index 756e19fc2795..598c8e2f8d2b 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile +++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile @@ -26,6 +26,7 @@ brcmfmac-objs += \ wl_cfg80211.o \ fwil.o \ fweh.o \ + fwsignal.o \ p2p.o \ dhd_cdc.o \ dhd_common.o \ @@ -39,3 +40,5 @@ brcmfmac-$(CONFIG_BRCMFMAC_USB) += \ usb.o brcmfmac-$(CONFIG_BRCMDBG) += \ dhd_dbg.o +brcmfmac-$(CONFIG_BRCM_TRACING) += \ + tracepoint.o |