summaryrefslogtreecommitdiffstats
path: root/drivers/media/Kconfig
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-02 11:17:27 -0700
committerKees Cook <keescook@chromium.org>2013-01-11 11:38:06 -0800
commit51e8cb7454c8dd294596e8cfa49afb92447a4987 (patch)
tree0428f0690e8a03a91f5248ebd7b863cf40bb3885 /drivers/media/Kconfig
parent86147c84c666549e3191b4acadddd783bcd88e0a (diff)
downloadlinux-51e8cb7454c8dd294596e8cfa49afb92447a4987.tar.bz2
drivers/media: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL 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 from any "depends on" lines in Kconfigs. CC: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/Kconfig')
-rw-r--r--drivers/media/Kconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 4ef0d80b57f4..8567a7a64104 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.