From patchwork Mon Jul 10 08:48:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9832595 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 1B65B60318 for ; Mon, 10 Jul 2017 08:49:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FFD127FB7 for ; Mon, 10 Jul 2017 08:49:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 042AB28405; Mon, 10 Jul 2017 08:49:59 +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=unavailable 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 95DD4283D8 for ; Mon, 10 Jul 2017 08:49:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753696AbdGJItf (ORCPT ); Mon, 10 Jul 2017 04:49:35 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:61096 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753588AbdGJIte (ORCPT ); Mon, 10 Jul 2017 04:49:34 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0LhGKW-1dzNA524qO-00mdsU; Mon, 10 Jul 2017 10:49:09 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , Sascha Hauer , Philipp Zabel , Russell King , Steve Longerbeam , Sakari Ailus , Pavel Machek , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [media] platform: video-mux: fix Kconfig dependency Date: Mon, 10 Jul 2017 10:48:43 +0200 Message-Id: <20170710084906.1937968-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:VUFM0XiaijAQuKAfaR5E5K3Xn+fPoiYDzdu7wuW2S2WIKsPis1o JXqxWogKgO9VC5yxOV3F3vkgKUJ+Zckx2maFxL+hpk3IlCRP79knTw0RrnhRMhk/Juvec4q Ma7F5XP8i1D1uv3SWcGMWwU5kYujcOlYmW4LyMSHI22Pdh5I7x5X2E7QMoPejwNcKI1KYaq hMxvBBso4aX3MKKAqthPA== X-UI-Out-Filterresults: notjunk:1; V01:K0:yHEvyTCVmE4=://vZmYcjQbbSC1NsuzWiys Rm2EBohhhuO2kCdSifEbs1ZtZ5W2ICZg/NI6VnQLTYn5wqrYmyXZpgApuVAuJErSFf37G01lK 32z5mfjosZm5s+ptZLlC3jK7e9M+6g1mKKcB36v5btyWka0fXnBBW/gQbePayrKqW6wK80kWa 0rO2Z40HaqOJHVnXTsa0Bao28e/HP8AhuQLQwkNUI1Dc1bo7WW8+gPgYy2sHjYul6izVQdGsa fyh8KNcFBh9h5PYRarPvvyWUxgRUY9+7XpkM+2ITspvsQHUPk+X6r9uL2UO+hEEYm/9ntNNba jvVYF0K4pPvQ2PyF5BHRGMIT6eV5Uv1tvnDROXeXtjaQIIutoUcgrorf8QufdSoE8dxT+J2kA IfKqX9KwOKItAS1bxmKVhzFspBOCIlcI/aHmzPhoHW9iQZnywciRQ8+4TG4oDa1lSksPBHCz/ /j7i0SjAC9kX9P3luFijjfIXENSheX4SwBXIHWZmYaorXE94yaU/3lHb26IgfDpFjXX7LS9kg MpwRBrXJpGkmL0jeqFwKT1bvMFnGWabqYlxTfgbf0X7jp/B5055zIKJqsXwH2gT+zB6bszqXJ S7ySXDYDR7IOvoz/tHBAEs04EXHBrk0NMLsNsUyGssgDmfBI81yp7eAm8PbZ3rllXQk0B5eRa /p7LvISwkXrU3hd5I2h/LEwRFXy03m+JB20znBDCTzN7X6o6Z/HV88B+HOU2oYJjThcM= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_V4L2 is built as a loadable module, the new video mux driver fails to link as built-in code: drivers/media/platform/video-mux.o: In function `video_mux_remove': video-mux.c:(.text+0x24): undefined reference to `v4l2_async_unregister_subdev' drivers/media/platform/video-mux.o: In function `video_mux_probe': video-mux.c:(.text+0x800): undefined reference to `v4l2_subdev_init' video-mux.c:(.text+0xa10): undefined reference to `v4l2_async_register_subdev' This makes it use the same Kconfig dependency as all the other users of the VIDEO_V4L2_SUBDEV_API symbol. Fixes: 68803ad4522f ("[media] platform: add video-multiplexer subdevice driver") Cc: Sascha Hauer Cc: Philipp Zabel Signed-off-by: Arnd Bergmann --- Cc: Russell King Cc: Steve Longerbeam Cc: Sakari Ailus Cc: Pavel Machek --- 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 fb1fa0b82077..20179eb8f31e 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -76,7 +76,7 @@ config VIDEO_M32R_AR_M64278 config VIDEO_MUX tristate "Video Multiplexer" - depends on OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER + depends on VIDEO_V4L2 && OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER select REGMAP help This driver provides support for N:1 video bus multiplexers.