summaryrefslogtreecommitdiffstats
path: root/drivers/rpmsg
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-12 11:58:56 +0200
committerBjorn Andersson <bjorn.andersson@linaro.org>2016-09-12 07:05:13 -0700
commit395317bbc200fbc164e65cc8ec31fa9d766aeaf1 (patch)
tree54a918a61696354c55322a75f9562ef294f4a71b /drivers/rpmsg
parent53e2822e56c7bc67e5dc19acb1e5fbb8ebff8614 (diff)
downloadlinux-395317bbc200fbc164e65cc8ec31fa9d766aeaf1.tar.gz
linux-395317bbc200fbc164e65cc8ec31fa9d766aeaf1.tar.bz2
linux-395317bbc200fbc164e65cc8ec31fa9d766aeaf1.zip
rpmsg: smd: fix dependency on QCOM_SMD=n
The ARM allmodconfig build broke with the addition of the SMD rpmsg driver that conflicts with the driver its replaces: WARNING: drivers/soc/qcom/smd: 'qcom_smd_register_edge' exported twice. Previous export was in drivers/rpmsg/qcom_smd.ko WARNING: drivers/soc/qcom/smd: 'qcom_smd_unregister_edge' exported twice. Previous export was in drivers/rpmsg/qcom_smd.ko There is already a dependency that is meant to avoid the broken configuration, but that only prevents the case where at least one of the two are built-in, but not if both are modules. This changes the dependency to "=n", to ensure that the new driver can only be enabled if the other one is completely disabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 53e2822e56c7 ("rpmsg: Introduce Qualcomm SMD backend") Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/rpmsg')
-rw-r--r--drivers/rpmsg/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig
index 9ba5a2e5c930..de31c5f14dd9 100644
--- a/drivers/rpmsg/Kconfig
+++ b/drivers/rpmsg/Kconfig
@@ -7,7 +7,7 @@ config RPMSG
config RPMSG_QCOM_SMD
tristate "Qualcomm Shared Memory Driver (SMD)"
depends on QCOM_SMEM
- depends on !QCOM_SMD
+ depends on QCOM_SMD=n
select RPMSG
help
Say y here to enable support for the Qualcomm Shared Memory Driver