From ec382328f670398db280f7c497a140fc284d1b9f Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Wed, 27 Jun 2012 10:12:31 -0300
Subject: [PATCH] --- yaml --- r: 311903 b: refs/heads/master c:
 ec3ed85f926f4e900bc48cec6e72abbe6475321f h: refs/heads/master i:   311901:
 fb02fe532956e03cc48d262b855fd2f6f4919365   311899:
 cc88824c688e5ff092f40fc2c25624ef0b951932   311895:
 d4623d8e1be741e61ce75e013e0a75027dfaf6c4   311887:
 d98e674667927550f6f61260a9f2d1d4199d8880   311871:
 ff283ca95ce0951b62340a0a69fd30c4e544c9c3 v: v3

---
 [refs]                                                     | 2 +-
 trunk/Documentation/DocBook/media/v4l/controls.xml         | 2 +-
 .../Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 7a77b764a531..7b6b497f6569 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e39da01027eb73556c1ad416945e37f2771464e
+refs/heads/master: ec3ed85f926f4e900bc48cec6e72abbe6475321f
diff --git a/trunk/Documentation/DocBook/media/v4l/controls.xml b/trunk/Documentation/DocBook/media/v4l/controls.xml
index 89941329290e..43ca749fc5e3 100644
--- a/trunk/Documentation/DocBook/media/v4l/controls.xml
+++ b/trunk/Documentation/DocBook/media/v4l/controls.xml
@@ -3988,7 +3988,7 @@ interface and may change in the future.</para>
 	    from RGB to Y'CbCr color space.
 	    </entry>
 	  </row>
-	  <row id = "v4l2-jpeg-chroma-subsampling">
+	  <row>
 	    <entrytbl spanname="descr" cols="2">
 	      <tbody valign="top">
 		<row>
diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
index e3d5afcdafbb..0a4b90fcf2da 100644
--- a/trunk/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
+++ b/trunk/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
@@ -284,13 +284,6 @@ These controls are described in <xref
 	    processing controls. These controls are described in <xref
 	    linkend="image-process-controls" />.</entry>
 	  </row>
-	  <row>
-	    <entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry>
-	    <entry>0x9d0000</entry>
-	    <entry>The class containing JPEG compression controls.
-These controls are described in <xref
-		linkend="jpeg-controls" />.</entry>
-	  </row>
 	</tbody>
       </tgroup>
     </table>