From: Bjorn Andersson <bjorn.andersson@linaro.org>
Date: Thu, 17 Nov 2016 06:19:47 +0000 (-0800)
Subject: Merge branch 'topic/st_fdma' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f88536f1a5dcf9a3964a48c0374ca5061533bc42;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'topic/st_fdma' of git://git./linux/kernel/git/vkoul/slave-dma into rproc-next
---

f88536f1a5dcf9a3964a48c0374ca5061533bc42
diff --cc drivers/remoteproc/Kconfig
index c199b360067f,14d5d2d43a38..9c41128750ca
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@@ -106,9 -100,10 +107,9 @@@ config QCOM_WCNSS_PI
  	tristate "Qualcomm WCNSS Peripheral Image Loader"
  	depends on OF && ARCH_QCOM
  	depends on QCOM_SMEM
+ 	depends on REMOTEPROC
  	select QCOM_MDT_LOADER
  	select QCOM_SCM
- 	select REMOTEPROC
 -	select QCOM_WCNSS_IRIS
  	help
  	  Say y here to support the Peripheral Image Loader for the Qualcomm
  	  Wireless Connectivity Subsystem.
diff --cc drivers/remoteproc/Makefile
index 523f5128a1f1,924f0cb25470..6290c3f72e83
--- a/drivers/remoteproc/Makefile
+++ b/drivers/remoteproc/Makefile
@@@ -12,10 -11,9 +12,11 @@@ obj-$(CONFIG_OMAP_REMOTEPROC)		+= omap_
  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_ADSP_PIL)		+= qcom_adsp_pil.o
  obj-$(CONFIG_QCOM_MDT_LOADER)		+= qcom_mdt_loader.o
  obj-$(CONFIG_QCOM_Q6V5_PIL)		+= qcom_q6v5_pil.o
 -obj-$(CONFIG_QCOM_WCNSS_IRIS)		+= qcom_wcnss_iris.o
 -obj-$(CONFIG_QCOM_WCNSS_PIL)		+= qcom_wcnss.o
 +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