Received: by 10.223.185.116 with SMTP id b49csp1041038wrg; Fri, 23 Feb 2018 10:50:38 -0800 (PST) X-Google-Smtp-Source: AH8x224nnu0GENI1JP9SDKJ0oPys7qbaKYK0Qd9awIFW9hK6z8zQNq8qeX58hcTBviZ2r914tups X-Received: by 10.98.0.67 with SMTP id 64mr2644073pfa.63.1519411838296; Fri, 23 Feb 2018 10:50:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519411838; cv=none; d=google.com; s=arc-20160816; b=GfTklfU+vWQLmFBimOYTgQNL2MyKBYKwpQ+FWgaBvoE5A+Z+hZTk7fncV3nPHsFyoC CBSi8uTP5B1T0PyeMs6yfxqCKV4qbv6O1jLl32nETG6WksVW4Nwh/9BZrzH2X6pQaQpp UUj7h53rJaLJ7taYqr8mgNqSvQefy5iPmpwKLIUmT9bEFiVEnagMNb4eu9TBoUzkY88K Qx1P6DAAM6Sq7Q38dc2gkETsSoAW7qGgCiERIRDifi+8QDlrom9VIYr13jwDv+A8XvWh CTKmM1/DG3mHcHd6TtUVRRYlgUBg+OlzrdcpEjz2YdL/NZPRAFkQqIvMgIsTKyAd1NZ3 /q6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=754VRWN/ksy/VL92wObm8B0m6XNT1i3ncqs8qYYfXUE=; b=Ta56lIdDpuxklIv3bJB6QbAlWDb+tyEV9/Kbyq2NYApimSH/L3DIfYUv3E5ocV6ni7 YsjmCc0C4mwf1Fd4l/ISjZKuqCOFBxBHta0IPVl52jk5BzkSOleYTbd554RQ6e30lCiO k5PXlSzXq51+YHOvyGLedn6xeNgaA+w5sluDvjifOgQ0aGqW3IlSMcg6VMEMmroTBkLV PFRu6nF32a2xle0pn7Fx4muIWH+d3lQPEBMGkR1PC4+wst7jAP5iuPUxVQLEe8Q2XNBK 4E4uc0FnHC/GDAvOS3qThkxGf8v8FIOOVU29ElYZtCT3Uq+Kz5k5YRe7GFU04TRXpx8r 7FrQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9-v6si2111458pls.560.2018.02.23.10.50.23; Fri, 23 Feb 2018 10:50:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934502AbeBWStQ (ORCPT + 99 others); Fri, 23 Feb 2018 13:49:16 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:45182 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934483AbeBWStK (ORCPT ); Fri, 23 Feb 2018 13:49:10 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 48BB110ED; Fri, 23 Feb 2018 18:49:09 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Mauro Carvalho Chehab Subject: [PATCH 4.9 128/145] [media] go7007: add MEDIA_CAMERA_SUPPORT dependency Date: Fri, 23 Feb 2018 19:27:14 +0100 Message-Id: <20180223170741.348607409@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170724.669759283@linuxfoundation.org> References: <20180223170724.669759283@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann commit fa6317eedd6341f2144ed1097706d8c34f18b6e4 upstream. If MEDIA_SUBDRV_AUTOSELECT and VIDEO_GO7007 are both set, we automatically select VIDEO_OV7640, but that depends on MEDIA_CAMERA_SUPPORT, so we get a Kconfig warning if that is disabled: warning: (VIDEO_GO7007) selects VIDEO_OV7640 which has unmet direct dependencies (MEDIA_SUPPORT && I2C && VIDEO_V4L2 && MEDIA_CAMERA_SUPPORT) This adds another dependency so we don't accidentally select it when it is unavailable. Signed-off-by: Arnd Bergmann Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/go7007/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/usb/go7007/Kconfig +++ b/drivers/media/usb/go7007/Kconfig @@ -11,7 +11,7 @@ config VIDEO_GO7007 select VIDEO_TW2804 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TW9903 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT - select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT + select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT ---help--- This is a video4linux driver for the WIS GO7007 MPEG