diff options
author | Kees Cook <keescook@chromium.org> | 2012-10-02 14:17:27 -0400 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2013-01-11 14:38:06 -0500 |
commit | 51e8cb7454c8dd294596e8cfa49afb92447a4987 (patch) | |
tree | 0428f0690e8a03a91f5248ebd7b863cf40bb3885 /drivers/media/Kconfig | |
parent | 86147c84c666549e3191b4acadddd783bcd88e0a (diff) |
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/Kconfig | 7 |
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 | |||
79 | # | 79 | # |
80 | 80 | ||
81 | config MEDIA_CONTROLLER | 81 | config MEDIA_CONTROLLER |
82 | bool "Media Controller API (EXPERIMENTAL)" | 82 | bool "Media Controller API" |
83 | depends on EXPERIMENTAL | ||
84 | depends on MEDIA_CAMERA_SUPPORT | 83 | depends on MEDIA_CAMERA_SUPPORT |
85 | ---help--- | 84 | ---help--- |
86 | Enable the media controller API used to query media devices internal | 85 | Enable the media controller API used to query media devices internal |
@@ -100,8 +99,8 @@ config VIDEO_DEV | |||
100 | default y | 99 | default y |
101 | 100 | ||
102 | config VIDEO_V4L2_SUBDEV_API | 101 | config VIDEO_V4L2_SUBDEV_API |
103 | bool "V4L2 sub-device userspace API (EXPERIMENTAL)" | 102 | bool "V4L2 sub-device userspace API" |
104 | depends on VIDEO_DEV && MEDIA_CONTROLLER && EXPERIMENTAL | 103 | depends on VIDEO_DEV && MEDIA_CONTROLLER |
105 | ---help--- | 104 | ---help--- |
106 | Enables the V4L2 sub-device pad-level userspace API used to configure | 105 | Enables the V4L2 sub-device pad-level userspace API used to configure |
107 | video format, size and frame rate between hardware blocks. | 106 | video format, size and frame rate between hardware blocks. |