From patchwork Mon Sep 12 09:58:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9326085 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AE60B60839 for ; Mon, 12 Sep 2016 10:00:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 988FA28CD0 for ; Mon, 12 Sep 2016 10:00:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C11928CC2; Mon, 12 Sep 2016 10:00:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 371D828CC2 for ; Mon, 12 Sep 2016 10:00:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757788AbcILJ7r (ORCPT ); Mon, 12 Sep 2016 05:59:47 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:60520 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757739AbcILJ7K (ORCPT ); Mon, 12 Sep 2016 05:59:10 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0M3jdZ-1asw1L08Ar-00rDbi; Mon, 12 Sep 2016 11:59:06 +0200 From: Arnd Bergmann To: Ohad Ben-Cohen , Bjorn Andersson Cc: Arnd Bergmann , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] rpmsg: smd: fix dependency on QCOM_SMD=n Date: Mon, 12 Sep 2016 11:58:56 +0200 Message-Id: <20160912095903.897647-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:8BH8E9Przc67Dd4yiLlOcxGCIlOkJ80h609fG33fj83KebtHrc0 weIJJsdIjnqZjR+NYIvZ70ZqPXuvdH/lF0+SWls0GkqQbzi6hvpnU1WrpgZbj38aKUHlxHt P5LjUaa9P+fjTbkTdad8V9lMij3o98rATCLthkpICeyxarS/IwEVnYlv2tlCw/KH9x6agGn AcSa3eEpKGTE++hmgiRrw== X-UI-Out-Filterresults: notjunk:1; V01:K0:9kZeFkDlObE=:nGuxwI+ilZ2H+FcQQda4m/ InGWX8wVCPyXVnOiCjELrd6J12gXVF+BcAOEzN72jRsCnvCe5aVKWQYKqlM2wg91ArdE/dSHG kNUpSiAjnqTvd2NiXsIGFT87g1NTE2dXU28V4H7UwHvkO7Lrsv1FDih183c+56bsd+6rWnX1e gjbwj2L1OvA76I/jv1h037i7Mwh6kAkvnKni9gSog0hc5HvwaCV+WzVRj4PECFGYw2JGc2FDT LvIlu1jmmQ2CbRbqgpG/f749qXZKfWP5JNrVPXsw+TZ8DT6yXB8zV2XHHsLRwzTnV7TlsRm0v xCKc2XclYSBs4pNgcXGm+BidzMI6TIJQsKt6MzOuxqcshBd4u5En7VVHf2Jo6iEcXTnic3nL4 +ofHVxQqdyVGXOdpNQrosVihxtcHoq7OO6Jtz8h5m/TvpVZGt/Kl4eGxwdsoqp41bHDBMJRO2 pALwvffFdvYhtIr3Rc7MoJy1w7S7PN46kaDQKqmMphqpmDArhypy/Ygd/K5jA2k8Rk5kPxmtd FMWfYfq0UsVPa8dJxiufoCyDD6aMTD37i915WmdF8VvZ2HUTqRRWD/9zUmUdAI2/Mxd18uNbE m/Gaq+NTIoiF8Na7QTvFNjHQ+DlR9NDmorCHQg8zkp4EKt9R+9uNgKefGVVcIj9ktn+D9IYjC 9o5og2mOTki2Nxvv72Zlm7Gm5J4A8OWyGnsrsR6RNh4zRWEf12fgU7wm7vlpYu+xETxU= Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Fixes: 53e2822e56c7 ("rpmsg: Introduce Qualcomm SMD backend") --- drivers/rpmsg/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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