From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932108AbcF3MV5 (ORCPT ); Thu, 30 Jun 2016 08:21:57 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:57651 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751858AbcF3MV4 (ORCPT ); Thu, 30 Jun 2016 08:21:56 -0400 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Laurent Pinchart , Arnd Bergmann , Hans Verkuil , Simon Horman , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] [media] vsp1: clarify FCP dependency Date: Thu, 30 Jun 2016 14:23:03 +0200 Message-Id: <20160630122325.4002029-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160630122325.4002029-1-arnd@arndb.de> References: <20160630122325.4002029-1-arnd@arndb.de> X-Provags-ID: V03:K0:IuVA0h98A5HPBHh5FRqd37w7vyX42st5zFtE5gl0IF3uZgyLPpi znSRm0DZGVtKBsYDDb3WBWXjN5OT7BgtYYpWX6NRwJTHzKm6Ucg4Cx7mjhmoBE8J5Dbw3GR vxMBcTOOkIcgJ42Ie0TFkg+sGorR3Cb+nsSakicLSOz+cXBETOCO3u1b/QhZ8aYRcbmMEEj Tji++cPLj4XI2X1Pah11A== X-UI-Out-Filterresults: notjunk:1;V01:K0:Xl6Ix9Zw8oY=:PAdtqM9WO72w8cM6KWsRE1 lJ/AiGiYS6FfRHMM3g4jAC6PGA6qnyqpldeSe3CqfTFUI/4weYrQP+RbRfMBu1uQvlZbJ14lH L2MZ6hVJDg++weukt56DHfcDQqge4c+BdwXMizVGnWnQ9D1UJcTOPBmOZODKbtE956WooUyde 2AlT17lHuomzlUL67IitLxUzHp5vvqBGw7YZLdN0zO6d03CmaL6v4GI1OFxN6jMMmLmyIVBgy +ypqTkAb9S9y+H7HIW6xEd95KFcZZ18FkCZmoFz7vZKz6SejkK4q3rr0ZRHrcqw8DywW3WsJt Bf/uuZ6wq58gbjwBisDHHJVXI35YZr6sVnl6yeNJ2Qapqbt0IeWfCNbEJwMWEmGSjxZsILM4/ vaA5JRrKr81xOBNtYkVt48ohtHdylo8V38ZQtZEVH/10KvAdl51d/E9gjpdltI2udGTjiDDsa pEDJVXbnEegNohUoBpZxZ8AkCqowucfi8MVjkhiTmSkZNx1vYDqJkWyCXBB6QBLpYEQxBummj 9Z9OLpgdcwqYjFQwt+nfyDkasYM3hqG/pTFDoh/zOweP+GC+yyHVIdtYmcBP/KaJc2RBen0vw y8tln9kgvPWOg+LNs1r0aVPuaD7AdsTZ5n22Oa7lYFhtjcgwRlFGEyFakj86WDF7MJAjGAbEE lLgU74xAVe4UM2cb+AcilDeMc33DIzWPzNCfUzNTlEC4y7gpr/2RqPlmi4AHKm2IcvwY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added FCP support in the vsp1 driver causes a link error when CONFIG_RENESAS_FCP=m, since it's not reachable by built-in code: drivers/media/built-in.o: In function `vsp1_remove': :(.text+0xdeca0): undefined reference to `rcar_fcp_put' drivers/media/built-in.o: In function `vsp1_probe': :(.text+0xdef44): undefined reference to `rcar_fcp_get' We already have a conditional dependency on FCP that requires it for ARM64, so for all others we just have to prevent setting RENESAS_VSP1=y when RENESAS_FCP=m by extending the FCP dependency. Signed-off-by: Arnd Bergmann Fixes: 94fcdf829793 ("[media] v4l: vsp1: Add FCP support") --- drivers/media/platform/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 9d0a3ffe36d2..8b6ac7d08289 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -265,7 +265,7 @@ config VIDEO_RENESAS_VSP1 tristate "Renesas VSP1 Video Processing Engine" depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA depends on (ARCH_RENESAS && OF) || COMPILE_TEST - depends on !ARM64 || VIDEO_RENESAS_FCP + depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP select VIDEOBUF2_DMA_CONTIG ---help--- This is a V4L2 driver for the Renesas VSP1 video processing engine. -- 2.9.0