From 1bc4d4adda251dfed6aa0ebc3f4b477ab341b1c5 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Tue, 2 Oct 2012 11:17:27 -0700
Subject: [PATCH] --- yaml --- r: 353528 b: refs/heads/master c:
 51e8cb7454c8dd294596e8cfa49afb92447a4987 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/media/Kconfig | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index db5eda5158fb..e8f995243980 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86147c84c666549e3191b4acadddd783bcd88e0a
+refs/heads/master: 51e8cb7454c8dd294596e8cfa49afb92447a4987
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
index 4ef0d80b57f4..8567a7a64104 100644
--- a/trunk/drivers/media/Kconfig
+++ b/trunk/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.