diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-12 19:58:56 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-12 19:58:56 +0300 |
| commit | f85bb96a52f47a016aa5b67a9eff0c7f19a5b64c (patch) | |
| tree | 0618209975b2807c01b18d384ded4f8342abe3a9 /drivers/net/wireless/ath/wcn36xx/Makefile | |
| parent | d4e209db57abe07163fe84b43b533a4b6246b0c3 (diff) | |
| parent | 0faf49393534fa4263bfbda7d0566e2e3d1aaf37 (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151112.0ll_20151112.0
Conflicting files:
Diffstat (limited to 'drivers/net/wireless/ath/wcn36xx/Makefile')
| -rw-r--r-- | drivers/net/wireless/ath/wcn36xx/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/wcn36xx/Makefile b/drivers/net/wireless/ath/wcn36xx/Makefile index 50c43b4382ba..9f6370f0cabc 100644 --- a/drivers/net/wireless/ath/wcn36xx/Makefile +++ b/drivers/net/wireless/ath/wcn36xx/Makefile @@ -1,7 +1,10 @@ -obj-$(CONFIG_WCN36XX) := wcn36xx.o +obj-$(CONFIG_WCN36XX) := wcn36xx.o wcn36xx-platform.o wcn36xx-y += main.o \ dxe.o \ txrx.o \ smd.o \ pmc.o \ debug.o + +wcn36xx-platform-y += wcn36xx-msm.o\ + wcnss_core.o |