Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[mirror_ubuntu-artful-kernel.git] / drivers / media / Kconfig

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index a8518fb3bca76a3a228d2b95eddc8557e85b13da..962f2a9a6614ccfb38b05eaab5badf6e5cfc9c82 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -80,6 +80,9 @@ config MEDIA_RC_SUPPORT
 
          Say Y when you have a TV or an IR device.
 
+config MEDIA_CEC_EDID
+       bool
+
 #
 # Media controller
 #      Selectable only for webcam/grabbers, as other drivers don't use it