diff options
author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-11-16 22:19:47 -0800 |
---|---|---|
committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-11-16 22:19:47 -0800 |
commit | f88536f1a5dcf9a3964a48c0374ca5061533bc42 (patch) | |
tree | 1294c23f49d7a0a14d4c60d419d2cacb8f27ce3c /drivers/remoteproc/Makefile | |
parent | b9e718e950c3dfa458bbf9180a8d8691e55413ae (diff) | |
parent | 6d066389d598b3c3818c3c841179c2f95bbfe702 (diff) | |
download | blackbird-op-linux-f88536f1a5dcf9a3964a48c0374ca5061533bc42.tar.gz blackbird-op-linux-f88536f1a5dcf9a3964a48c0374ca5061533bc42.zip |
Merge branch 'topic/st_fdma' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma into rproc-next
Diffstat (limited to 'drivers/remoteproc/Makefile')
-rw-r--r-- | drivers/remoteproc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile index 523f5128a1f1..6290c3f72e83 100644 --- a/drivers/remoteproc/Makefile +++ b/drivers/remoteproc/Makefile @@ -19,3 +19,4 @@ obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss_pil.o qcom_wcnss_pil-y += qcom_wcnss.o qcom_wcnss_pil-y += qcom_wcnss_iris.o obj-$(CONFIG_ST_REMOTEPROC) += st_remoteproc.o +obj-$(CONFIG_ST_SLIM_REMOTEPROC) += st_slim_rproc.o |