diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-11 18:44:25 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-11 18:44:25 +0100 |
| commit | 78f42aee884dedfd157f79d01f069550edbc95cf (patch) | |
| tree | 1f0b6a91c06cae83a647a076377d3279f7a9fb78 /drivers/net/wireless/brcm80211/brcmfmac/Makefile | |
| parent | aa5a1b8e68c95151fd249a3b5ec444c6b0aa2f1c (diff) | |
| parent | 8708aac79e4572ba673d7a21e94ddca9f3abb7fc (diff) | |
Merge remote-tracking branch 'wireless-next/master' into HEAD
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/Makefile')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile index 1a6661a9f00..756e19fc279 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 \ + p2p.o \ dhd_cdc.o \ dhd_common.o \ dhd_linux.o @@ -37,4 +38,4 @@ brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \ brcmfmac-$(CONFIG_BRCMFMAC_USB) += \ usb.o brcmfmac-$(CONFIG_BRCMDBG) += \ - dhd_dbg.o
\ No newline at end of file + dhd_dbg.o |