rpmsg: smd: fix dependency on QCOM_SMD=n
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Sep 2016 09:58:56 +0000 (11:58 +0200)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 12 Sep 2016 14:05:13 +0000 (07:05 -0700)
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>
drivers/rpmsg/Kconfig

index 9ba5a2e5c930198d98ff1cd027f911fd5216d13e..de31c5f14dd98b72e353f75ea1ad5f35843ed20a 100644 (file)
@@ -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