diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 0ba17501cade..88ff8bc4b3dd 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -81,7 +81,7 @@ config MEDIA_RC_SUPPORT
 	  Say Y when you have a TV or an IR device.
 
 config MEDIA_CEC_EDID
-	tristate
+	bool
 
 #
 # Media controller
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 1f3a2c6bb92c..8e66964e123a 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -2,7 +2,9 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-$(CONFIG_MEDIA_CEC_EDID) += cec-edid.o
+ifeq ($(CONFIG_MEDIA_CEC_EDID),y)
+  obj-$(CONFIG_MEDIA_SUPPORT) += cec-edid.o
+endif
 
 media-objs	:= media-device.o media-devnode.o media-entity.o