From patchwork Tue May 19 12:39:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 6436761 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 54CA69F38D for ; Tue, 19 May 2015 12:39:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75CA220453 for ; Tue, 19 May 2015 12:39:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8AC9220392 for ; Tue, 19 May 2015 12:39:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755022AbbESMj0 (ORCPT ); Tue, 19 May 2015 08:39:26 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:59362 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753651AbbESMjY (ORCPT ); Tue, 19 May 2015 08:39:24 -0400 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue001) with ESMTPSA (Nemesis) id 0MeGZ4-1YX6yK0m2Y-00Puxn; Tue, 19 May 2015 14:39:14 +0200 From: Arnd Bergmann To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Hans Verkuil , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Benoit Parrot , Prabhakar , Sakari Ailus Subject: [PATCH] [media] ov2659: add v4l2_subdev dependency Date: Tue, 19 May 2015 14:39:12 +0200 Message-ID: <6092911.yr0lA5IaG4@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:iMzS9iEPTSsSIMiYihyXzjRUpgq0nnIdmGuypakGrhSV/cg0JAu beWOD4NT0vwPGjJupERp/K8y3LkVV4PFkqfkJ10JBwqD6eOFpZ1Sx4OFfTWu43oD6HUrPip KmjRwslI0AV215dQRaDzoJ6raUcEMlS6NFCbObyymg5EXjmDzCQylcnKoj86LghUCtAk5xN 5/PZHlEDHds8+QnRXoRdw== X-UI-Out-Filterresults: notjunk:1; Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The newly added ov2659 driver uses the v4l2 subdev API, but can be enabled even when that API is not part of the kernel, resulting in this build error: media/i2c/ov2659.c: In function 'ov2659_get_fmt': media/i2c/ov2659.c:1054:8: error: implicit declaration of function 'v4l2_subdev_get_try_format' [-Werror=implicit-function-declaration] media/i2c/ov2659.c:1054:6: warning: assignment makes pointer from integer without a cast [-Wint-conversion] media/i2c/ov2659.c: In function 'ov2659_set_fmt': media/i2c/ov2659.c:1129:6: warning: assignment makes pointer from integer without a cast [-Wint-conversion] media/i2c/ov2659.c: In function 'ov2659_open': media/i2c/ov2659.c:1264:38: error: 'struct v4l2_subdev_fh' has no member named 'pad' This adds an explicit dependency, like all the other drivers have. Signed-off-by: Arnd Bergmann Fixes: c4c0283ab3c ("[media] media: i2c: add support for omnivision's ov2659 sensor") Acked-by: Benoit Parrot --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 6f30ea76151a..db01ed84918f 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -469,7 +469,7 @@ config VIDEO_SMIAPP_PLL config VIDEO_OV2659 tristate "OmniVision OV2659 sensor support" depends on VIDEO_V4L2 && I2C - depends on MEDIA_CAMERA_SUPPORT + depends on MEDIA_CAMERA_SUPPORT && VIDEO_V4L2_SUBDEV_API ---help--- This is a Video4Linux2 sensor-level driver for the OmniVision OV2659 camera.