diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-16 19:12:24 +0300 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-16 19:12:24 +0300 |
commit | 0708fc352c6ddb375ca9a14b2c2ce6d5342b4720 (patch) | |
tree | 4b481dbddbd1b222df0171782eb508638cab3b61 /drivers/remoteproc/Makefile | |
parent | bca37914c7bbcf5f616fe09a35a6001d001138cc (diff) | |
parent | ece3b3864848fa1a38c10078559c951886a2c1ea (diff) |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151016.0ll_20151016.0
Conflicting files:
Diffstat (limited to 'drivers/remoteproc/Makefile')
-rw-r--r-- | drivers/remoteproc/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile index 81b04d1e2e58..4351f2e462ad 100644 --- a/drivers/remoteproc/Makefile +++ b/drivers/remoteproc/Makefile @@ -11,3 +11,5 @@ obj-$(CONFIG_OMAP_REMOTEPROC) += omap_remoteproc.o obj-$(CONFIG_STE_MODEM_RPROC) += ste_modem_rproc.o obj-$(CONFIG_WKUP_M3_RPROC) += wkup_m3_rproc.o obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o +obj-$(CONFIG_QCOM_Q6V5_PIL) += qcom_q6v5_pil.o +obj-$(CONFIG_QCOM_TZ_PIL) += qcom_tz_pil.o |