From patchwork Thu Jun 4 09:39:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 64269 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1jgmN1-00HIAo-LL; Thu, 04 Jun 2020 09:41:08 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728021AbgFDJo6 (ORCPT + 1 other); Thu, 4 Jun 2020 05:44:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727888AbgFDJo6 (ORCPT ); Thu, 4 Jun 2020 05:44:58 -0400 X-Greylist: delayed 301 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 04 Jun 2020 02:44:58 PDT Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B5B8C03E96D for ; Thu, 4 Jun 2020 02:44:58 -0700 (PDT) Received: from ramsan ([IPv6:2a02:1810:ac12:ed60:c96f:783c:a430:4a5a]) by baptiste.telenet-ops.be with bizsmtp id mxfu2200V0MBGRv01xfuKF; Thu, 04 Jun 2020 11:39:54 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1jgmLq-0001Rt-9S; Thu, 04 Jun 2020 11:39:54 +0200 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1jgmLq-0000Vn-6s; Thu, 04 Jun 2020 11:39:54 +0200 From: Geert Uytterhoeven To: Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] medium: cec: Make MEDIA_CEC_SUPPORT default to n if !MEDIA_SUPPORT Date: Thu, 4 Jun 2020 11:39:53 +0200 Message-Id: <20200604093953.1353-1-geert@linux-m68k.org> X-Mailer: git-send-email 2.17.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no Recently, MEDIA_CEC_SUPPORT became indepedent of MEDIA_SUPPORT. However, if MEDIA_SUPPORT is not enabled, MEDIA_SUPPORT_FILTER is not defined, and MEDIA_CEC_SUPPORT is thus enabled by default, which is not desirable. Fix this by adding a dependency on MEDIA_CEC_SUPPORT to the default configuration. Fixes: 46d2a3b964ddbe63 ("media: place CEC menu before MEDIA_SUPPORT") Signed-off-by: Geert Uytterhoeven --- drivers/media/cec/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig index eea74b7cfa8c5dec..7e830444bdbbb1d1 100644 --- a/drivers/media/cec/Kconfig +++ b/drivers/media/cec/Kconfig @@ -24,7 +24,7 @@ config CEC_PIN_ERROR_INJ menuconfig MEDIA_CEC_SUPPORT bool prompt "HDMI CEC drivers" - default y if !MEDIA_SUPPORT_FILTER + default y if MEDIA_SUPPORT && !MEDIA_SUPPORT_FILTER help Enable support for HDMI CEC (Consumer Electronics Control), which is an optional HDMI feature.