From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966629AbeEYP0u (ORCPT ); Fri, 25 May 2018 11:26:50 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:59881 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936185AbeEYP0s (ORCPT ); Fri, 25 May 2018 11:26:48 -0400 From: Arnd Bergmann To: Mauro Carvalho Chehab , Arnd Bergmann Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] media: omap2: fix compile-testing with FB_OMAP2=m Date: Fri, 25 May 2018 17:25:12 +0200 Message-Id: <20180525152523.2821369-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525152523.2821369-1-arnd@arndb.de> References: <20180525152523.2821369-1-arnd@arndb.de> X-Provags-ID: V03:K1:cPjdStHgmjgkNsJHRdrFQFXyQAQpAlg3ebgj8XuUdU2b+hJiATX HGCQqXfsis7F3xBPERVFOn414rqiEjyFeWMn2ih+SP60bivZOB83Guzn7pYAhquVWb2/W4u ZI6lpnNDz9QdcgHsnF2F6NLf+XAGSpurOp4+FqFRDnZRRQtMwZsGRIPRItJ3FHPO3HBbI7P NZFnqP0a4H/V7BM8qzT5g== X-UI-Out-Filterresults: notjunk:1;V01:K0:5dh5rdLg1hw=:uXK/sAyipUsDC06bIsMNv/ zs2FVpKdRruQPXBzX+UKpz7sd+FhqFFU3tUtuo/x07X1W9NdZS8UWq5HcW4cE7Na1Yf1p6iRW r80wmA8KMp5sc0xVIXTAcB8DLkdZeF/CY5mAgObVIUFslE3RuKCvTlSccq+0/bIgc1kwDsJNY 1z+fOd5LTqbXluszsj/0EoahJ/6EXOUWNDnM7Ft6/nSt0vleV3HoodGH275F3qxOwnFDpKS41 xlitr7wn5CLjgktJew5Q705FkAIoLeJL0zgq9KU6bMZwlTzt43mDDKuDk+AnWUolFqylAN3mW 1f/vP+LrW82NKk6qt6Gb8Whu1hcymRs+sIZN99UayxoRbErsPnqes0DKg1H3HtHudLBUWiCyP ZEtGuxAyhOpuMTuL2IpRrRWbFXS9j/MMvqJ2ocb4p6jQz/aU/JD6XROZXuIFmd3IaelJpA6tU l4qT0iO5RbNm7ez5exTEpphpZRl3O9TPJkZS0w/KNclPPLbNMgt9mvlpvTm6Q7Qro5qKc9X6/ bQWrdUhOJDgCI9DriRJxwWcZ2XlzYG5zpoQhzwdYMI41DB6joeiu0SoS7r9jWb5a1dT37XYhX 0tZv8jQgt46Yb657+crMOm0VHmLLdKY7Qa3a130H4bdeh9vSqru8cWhvitekmfdqBk1MkD9i9 txNo1gWgde4JRP1N0McH3+N3h53BuE2LXpV/qhB3bsKVNWrB9ToDlbIrre2z5FQYREnk= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Compile-testing with FB_OMAP2=m results in a link error: drivers/media/platform/omap/omap_vout.o: In function `vidioc_streamoff': omap_vout.c:(.text+0x1028): undefined reference to `omap_dispc_unregister_isr' drivers/media/platform/omap/omap_vout.o: In function `omap_vout_release': omap_vout.c:(.text+0x1330): undefined reference to `omap_dispc_unregister_isr' drivers/media/platform/omap/omap_vout.o: In function `vidioc_streamon': omap_vout.c:(.text+0x2dd4): undefined reference to `omap_dispc_register_isr' drivers/media/platform/omap/omap_vout.o: In function `omap_vout_remove': In order to enable compile-testing but still keep the correct dependency, this changes the Kconfig logic so we only allow CONFIG_COMPILE_TEST building when FB_OMAP is completely disabled, or have use the old dependency on FB_OMAP to ensure VIDEO_OMAP2_VOUT is also a loadable module when FB_OMAP2 is. Fixes: d8555fd2f452 ("media: omap2: allow building it with COMPILE_TEST && DRM_OMAP") Signed-off-by: Arnd Bergmann --- drivers/media/platform/omap/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig index a414bcbb9b08..d827b6c285a6 100644 --- a/drivers/media/platform/omap/Kconfig +++ b/drivers/media/platform/omap/Kconfig @@ -6,7 +6,7 @@ config VIDEO_OMAP2_VOUT_VRFB config VIDEO_OMAP2_VOUT tristate "OMAP2/OMAP3 V4L2-Display driver" depends on MMU - depends on FB_OMAP2 || COMPILE_TEST + depends on FB_OMAP2 || (COMPILE_TEST && FB_OMAP2=n) depends on ARCH_OMAP2 || ARCH_OMAP3 || COMPILE_TEST select VIDEOBUF_GEN select VIDEOBUF_DMA_CONTIG -- 2.9.0