summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/media/v4l/compat.xml
diff options
context:
space:
mode:
authorHans Verkuil2011-05-23 12:36:55 +0200
committerMauro Carvalho Chehab2011-07-27 22:55:39 +0200
commitaec67f054205da77f83ba52f83239225d6cbe366 (patch)
treea291e77724025a388fbb7acbd041cddbec072b57 /Documentation/DocBook/media/v4l/compat.xml
parent[media] vivi: add bitmask test control (diff)
downloadkernel-qcow2-linux-aec67f054205da77f83ba52f83239225d6cbe366.tar.gz
kernel-qcow2-linux-aec67f054205da77f83ba52f83239225d6cbe366.tar.xz
kernel-qcow2-linux-aec67f054205da77f83ba52f83239225d6cbe366.zip
[media] DocBook: document V4L2_CTRL_TYPE_BITMASK
[mchehab@redhat.com: Fix a merge conflict and make compat.xml coherent with v4l2.xml] Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/DocBook/media/v4l/compat.xml')
-rw-r--r--Documentation/DocBook/media/v4l/compat.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index b010ac6bfd2c..d7c015e8df81 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2360,6 +2360,16 @@ that used it. It was originally scheduled for removal in 2.6.35.
</listitem>
</orderedlist>
</section>
+ <section>
+ <title>V4L2 in Linux 3.1</title>
+ <orderedlist>
+ <listitem>
+ <para>VIDIOC_QUERYCAP now returns a per-subsystem version instead of a per-driver one.</para>
+ <para>Standardize an error code for invalid ioctl.</para>
+ <para>Added V4L2_CTRL_TYPE_BITMASK.</para>
+ </listitem>
+ </orderedlist>
+ </section>
<section id="other">
<title>Relation of V4L2 to other Linux multimedia APIs</title>