Merge git://git.infradead.org/intel-iommu

[firefly-linux-kernel-4.4.55.git] / drivers / media / Kconfig

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 49cd30870e0d6ff6fb293fc33fd0af850cd6590c..3ef0f90b128fc5bdf6d5e5dff0d5bbfbd5190d7b 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -87,13 +87,21 @@ config MEDIA_RC_SUPPORT
 
 config MEDIA_CONTROLLER
        bool "Media Controller API"
-       depends on MEDIA_CAMERA_SUPPORT
+       depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
        ---help---
          Enable the media controller API used to query media devices internal
          topology and configure it dynamically.
 
          This API is mostly used by camera interfaces in embedded platforms.
 
+config MEDIA_CONTROLLER_DVB
+       bool "Enable Media controller for DVB"
+       depends on MEDIA_CONTROLLER
+       ---help---
+         Enable the media controller API support for DVB.
+
+         This is currently experimental.
+
 #
 # Video4Linux support
 #      Only enables if one of the V4L2 types (ATV, webcam, radio) is selected