From patchwork Mon Sep 19 12:46:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9339267 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 E3C46601C2 for ; Mon, 19 Sep 2016 12:47:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC7552890C for ; Mon, 19 Sep 2016 12:47:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0B9A28989; Mon, 19 Sep 2016 12:47:12 +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.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 3D7462890C for ; Mon, 19 Sep 2016 12:47:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755213AbcISMrJ (ORCPT ); Mon, 19 Sep 2016 08:47:09 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:52310 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753895AbcISMrI (ORCPT ); Mon, 19 Sep 2016 08:47:08 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0Lwzrl-1awtlg3kcb-016cdM; Mon, 19 Sep 2016 14:46:58 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab , Hans Verkuil Cc: Robert Jarzmik , Arnd Bergmann , Laurent Pinchart , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [media] platform: pxa_camera: add VIDEO_V4L2 dependency Date: Mon, 19 Sep 2016 14:46:30 +0200 Message-Id: <20160919124655.1466734-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:W4VeunmeCbUkmwvtaJi1AmL/J8qGmC+yds5z703zBEXMwKoLe+7 NElPv+Q2XFMqjgi70g2kkP6ne0NAePq7nzqFCoZPQu32J8fSDNEU02xDRYKzncgpuTzOtRv +wgjZy8m2oc/6cl5briZAukVZBQ+XL6/VGZhzqtzvdTSEuACYdP89Bin+3ffx9vmEjmCyUq WBnaBc0hz5sw0DmA+UTgA== X-UI-Out-Filterresults: notjunk:1; V01:K0:tsCEEHefck4=:VfjhSZjTDTB2V2epLfS9il WB+ktRuBC0D8/+Y11FReEQgjcnxKHgpu0YLepFd5qBWB9pJ2/hM9Lbl1jaoRGNJ0eigY/jOCq kBx0lejbRgpTOj/q44nJxQrO5h8Zhxmmjvhg4RgXxboia8rrNVvye3DIeA22aeCq1j209Sqb/ skJB6EiT2e+675NYwFR6ViYfiVcC2gjtymJ6RnOmJV73QP8ZUFc13vU64eD7/OcO6+Rx6dGqP 1REA60JbfBo2vj66hSHrumLV9nmuzM5J6q6/e4z2maLy0a10b20SUDu3NJELLF5JbaSuH674I 2iRDw29SLPDWJHJlfRo76tGY69Th7g5aron9WfYApYakoJ3PnXuGd45ARD2M2AI+0CYOt3kDZ qNgiU36Yuc5bwTXj4fgzjJg8pGwYtWbe07QkPRbN2X82jZ5r+xDkOWDjraKS/HMok8p3aX/jn p6w0fXTfcenpJPX84X7IcSRcF+ulquHx/pPWgAgP7OGEdJbZOvRQNFx7NlfDHJerdb0QMJ3O2 0sor4ReMd/YkwdX/U2SDnodiGXsXJ1+oUPCTF/3XwJrCwwFUih7PeD6Rrwi3qKBJkfzaE+akX I1OJZiCIus5J18sGWsiW2GvRDf2ti6yucsAf7Ku+HDS6jCkbQyoT87sjVSR5mVCMO1iCjXyhc JA0Q7o+yy1H/RHw/cvvpgo6i8DfPIGHb0HkZ75CUs6oap0KmVHKTV5xAWF/pmzE2rShc= 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 Moving the pxa_camera driver from soc_camera lots the implied VIDEO_V4L2 Kconfig dependency, and building the driver without V4L2 results in a kernel that cannot link: drivers/media/platform/pxa_camera.o: In function `pxa_camera_remove': pxa_camera.c:(.text.pxa_camera_remove+0x10): undefined reference to `v4l2_clk_unregister' pxa_camera.c:(.text.pxa_camera_remove+0x18): undefined reference to `v4l2_device_unregister' drivers/media/platform/pxa_camera.o: In function `pxa_camera_probe': pxa_camera.c:(.text.pxa_camera_probe+0x458): undefined reference to `v4l2_of_parse_endpoint' drivers/media/v4l2-core/videobuf2-core.o: In function `__enqueue_in_driver': drivers/media/v4l2-core/videobuf2-core.o: In function `vb2_core_streamon': videobuf2-core.c:(.text.vb2_core_streamon+0x1b4): undefined reference to `v4l_vb2q_enable_media_source' drivers/media/v4l2-core/videobuf2-v4l2.o: In function `vb2_ioctl_reqbufs': videobuf2-v4l2.c:(.text.vb2_ioctl_reqbufs+0xc): undefined reference to `video_devdata' This adds back an explicit dependency. Fixes: 3050b9985024 ("[media] media: platform: pxa_camera: move pxa_camera out of soc_camera") Signed-off-by: Arnd Bergmann Acked-by: Robert Jarzmik --- 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 ce4a96fccc43..5ff803efdc03 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -93,7 +93,7 @@ config VIDEO_OMAP3_DEBUG config VIDEO_PXA27x tristate "PXA27x Quick Capture Interface driver" - depends on VIDEO_DEV && HAS_DMA + depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA depends on PXA27x || COMPILE_TEST select VIDEOBUF2_DMA_SG select SG_SPLIT