From 48a28b2229770d880ead7ba1daf625b722d5d734 Mon Sep 17 00:00:00 2001
From: Sakari Ailus <sakari.ailus@iki.fi>
Date: Sat, 7 Jan 2012 06:23:36 -0300
Subject: [PATCH] --- yaml --- r: 306145 b: refs/heads/master c:
 8766e86535c9c9d46621f285b85266b2975348c2 h: refs/heads/master i:   306143:
 26ba232b665c21693a56ad90f545346b1ee9bfe6 v: v3

---
 [refs]                                                   | 2 +-
 trunk/Documentation/DocBook/media/v4l/compat.xml         | 7 +++++++
 .../DocBook/media/v4l/vidioc-subdev-g-crop.xml           | 9 ++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0360f42c2c7b..62d21839b768 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 955f645aea04f3130d39c7889e2c5bd7f6d638a3
+refs/heads/master: 8766e86535c9c9d46621f285b85266b2975348c2
diff --git a/trunk/Documentation/DocBook/media/v4l/compat.xml b/trunk/Documentation/DocBook/media/v4l/compat.xml
index 0fc74ca81f0f..87339b2aad78 100644
--- a/trunk/Documentation/DocBook/media/v4l/compat.xml
+++ b/trunk/Documentation/DocBook/media/v4l/compat.xml
@@ -2557,6 +2557,13 @@ interfaces and should not be implemented in new drivers.</para>
 <constant>VIDIOC_S_MPEGCOMP</constant> ioctls. Use Extended Controls,
 <xref linkend="extended-controls" />.</para>
         </listitem>
+        <listitem>
+	  <para><constant>VIDIOC_SUBDEV_G_CROP</constant> and
+	  <constant>VIDIOC_SUBDEV_S_CROP</constant> ioctls. Use
+	  <constant>VIDIOC_SUBDEV_G_SELECTION</constant> and
+	  <constant>VIDIOC_SUBDEV_S_SELECTION</constant>, <xref
+	  linkend="vidioc-subdev-g-selection" />.</para>
+        </listitem>
       </itemizedlist>
     </section>
   </section>
diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml
index 06197323a8cc..4cddd788c589 100644
--- a/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml
+++ b/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml
@@ -58,9 +58,12 @@
     <title>Description</title>
 
     <note>
-      <title>Experimental</title>
-      <para>This is an <link linkend="experimental">experimental</link>
-      interface and may change in the future.</para>
+      <title>Obsolete</title>
+
+      <para>This is an <link linkend="obsolete">obsolete</link>
+      interface and may be removed in the future. It is superseded by
+      <link linkend="vidioc-subdev-g-selection">the selection
+      API</link>.</para>
     </note>
 
     <para>To retrieve the current crop rectangle applications set the