diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index a8def1591352dba34dc8caf45e186baf2d6e6145..836c2be6c522f47065b0e78140a9fedba5b36783 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 31417feaa213da7fa1d26f5699af3ddfa9bf1ba3..c01919713ab956cbab98cddb91604a4b7f62aaa9 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