summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/media/Kconfig13
-rw-r--r--drivers/media/cec/Kconfig10
2 files changed, 13 insertions, 10 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index a8def1591352..836c2be6c522 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -3,6 +3,19 @@
# Multimedia device configuration
#
+#
+# NOTE: Those symbols can't depend on MEDIA_SUPPORT, as it would cause
+# unmatched dependencies
+#
+config CEC_CORE
+ tristate
+
+config CEC_NOTIFIER
+ bool
+
+config CEC_PIN
+ bool
+
source "drivers/media/rc/Kconfig"
menuconfig MEDIA_SUPPORT
diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig
index 31417feaa213..c01919713ab9 100644
--- a/drivers/media/cec/Kconfig
+++ b/drivers/media/cec/Kconfig
@@ -1,14 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-
-config CEC_CORE
- tristate
-
-config CEC_NOTIFIER
- bool
-
-config CEC_PIN
- bool
-
config MEDIA_CEC_RC
bool "HDMI CEC RC integration"
depends on CEC_CORE && RC_CORE