Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / Documentation / DocBook / media / v4l / compat.xml

diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index a2485b3ff3d267f47020714382543bc8ca157d43..bce97c50391b008203544846b6621eb52444a9ed 100644 (file)
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2393,6 +2393,20 @@ details.</para>
            to the <link linkend="control">User controls class</link>.
          </para>
         </listitem>
+        <listitem>
+         <para>Added the device_caps field to struct v4l2_capabilities and added the new
+         V4L2_CAP_DEVICE_CAPS capability.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section>
+      <title>V4L2 in Linux 3.4</title>
+      <orderedlist>
+        <listitem>
+         <para>Added <link linkend="jpeg-controls">JPEG compression control
+         class</link>.</para>
+        </listitem>
       </orderedlist>
     </section>