This config item has not carried much meaning for a while now and is
almost always enabled by default. As agreed during the Linux kernel
summit, remove it.

CC: Mauro Carvalho Chehab <mche...@infradead.org>
Signed-off-by: Kees Cook <keesc...@chromium.org>
---
 drivers/media/Kconfig |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 4ef0d80..8567a7a 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -79,8 +79,7 @@ config MEDIA_RC_SUPPORT
 #
 
 config MEDIA_CONTROLLER
-       bool "Media Controller API (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "Media Controller API"
        depends on MEDIA_CAMERA_SUPPORT
        ---help---
          Enable the media controller API used to query media devices internal
@@ -100,8 +99,8 @@ config VIDEO_DEV
        default y
 
 config VIDEO_V4L2_SUBDEV_API
-       bool "V4L2 sub-device userspace API (EXPERIMENTAL)"
-       depends on VIDEO_DEV && MEDIA_CONTROLLER && EXPERIMENTAL
+       bool "V4L2 sub-device userspace API"
+       depends on VIDEO_DEV && MEDIA_CONTROLLER
        ---help---
          Enables the V4L2 sub-device pad-level userspace API used to configure
          video format, size and frame rate between hardware blocks.
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to