summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2020-06-04 12:39:53 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-06-11 20:19:50 +0300
commit15168b204691aa8cbff043c1151e9dbfdd088364 (patch)
tree332a891a87360c09d791ee5dcb77ec93c303ed7c /drivers/media
parentd5aecd289babf3adcf5a837b067a5efddb097d99 (diff)
downloadlinux-15168b204691aa8cbff043c1151e9dbfdd088364.tar.xz
media: medium: cec: Make MEDIA_CEC_SUPPORT default to n if !MEDIA_SUPPORT
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 <geert@linux-m68k.org> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/cec/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig
index eea74b7cfa8c..7e830444bdbb 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.