Received: by 10.223.185.116 with SMTP id b49csp1124964wrg; Fri, 23 Feb 2018 12:21:49 -0800 (PST) X-Google-Smtp-Source: AH8x2255x86nlMLxbuc5yw6pDi8Y0pa1r45yLtWOkvKU5qHhDo/qmIhV4G92kF2q1z+PhmluN3Jm X-Received: by 2002:a17:902:968b:: with SMTP id n11-v6mr2783490plp.168.1519417308993; Fri, 23 Feb 2018 12:21:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519417308; cv=none; d=google.com; s=arc-20160816; b=CkbBs6+nb7NGuuyiB9L3c7Hk4VU8OfWckjvhhmJ4cmN3SsyWqWI7ia8TAwWIvW1p7m FbPXfpT7jhYyWw8iReks4zc/yas8zq9Fy1j2OfiaOy+54/bv6GL8TYZdeLz/12hG/GXx bubcfRkGqK2doUBatdYTPDYoRo6SG+qQ7UNSkEfwojQLTGgOOPnCB9NNdi+ulfohRZnL F5PJ/ZFZMAw9QVrYHHlpBP99ELQI/x3BW1M4q8ex912ACuUXjYXhm/uw8toc+PheRVzL qYwiVyKexgZpM0mNA0ePB9HGgJ00DFyOpw4RK/HT/URBpsUTpaQKvewWbdXJpH5qMWD0 VvLQ== 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=3xWuqhobklHI9s5kC1NIJaZhuldwIxd4RBdtEh4dA+0=; b=rz8fB/eYYB424CrOychyBsUWgKKw59F9vC5buqP8R8cPLu1ts6IDx+mTsJB1ZSMa1m 42fhhqg/cI5DgHu7oGfLwU0hj0skmH2yObqyzvz+KJXpUMFTJOYyQhPLC17IrU4gjQV3 I0yEdvNZq36LVHRlv0DlJcM2vqig1W+j7iGA5+fSzDIUNqnEgjKBw1XIlfGTtsiVJsEQ WIk6+dySorDSxG1VQyiC16yFLtsaA9WQKC/afvefD28tCKyBi5j8+4k2wNq3oC1wQwnA tn8zqOU714Rzra9At9b9b6138R03qFF3MhLONBFIRRJR2EcDsyZKAJlHF6YDQPTMRUe2 s2zA== 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 x3-v6si1309184plo.608.2018.02.23.12.21.35; Fri, 23 Feb 2018 12:21:48 -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 S932484AbeBWSjB (ORCPT + 99 others); Fri, 23 Feb 2018 13:39:01 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:39492 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932143AbeBWSi5 (ORCPT ); Fri, 23 Feb 2018 13:38:57 -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 276C3114E; Fri, 23 Feb 2018 18:38:56 +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.4 134/193] [media] go7007: add MEDIA_CAMERA_SUPPORT dependency Date: Fri, 23 Feb 2018 19:26:07 +0100 Message-Id: <20180223170346.823910090@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@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.4-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