diff options
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/v4l/compat.xml | 13 | ||||
| -rw-r--r-- | Documentation/DocBook/v4l/v4l2.xml | 13 |
2 files changed, 6 insertions, 20 deletions
diff --git a/Documentation/DocBook/v4l/compat.xml b/Documentation/DocBook/v4l/compat.xml index 4d74bf24e114..9f7cd4f25792 100644 --- a/Documentation/DocBook/v4l/compat.xml +++ b/Documentation/DocBook/v4l/compat.xml @@ -2354,9 +2354,12 @@ that used it. It was originally scheduled for removal in 2.6.35. </orderedlist> </section> <section> - <title>V4L2 in Linux 2.6.38</title> + <title>V4L2 in Linux 2.6.39</title> <orderedlist> <listitem> + <para>The old VIDIOC_*_OLD symbols and V4L1 support were removed.</para> + </listitem> + <listitem> <para>Multi-planar API added. Does not affect the compatibility of current drivers and applications. See <link linkend="planar-apis">multi-planar API</link> @@ -2364,14 +2367,6 @@ that used it. It was originally scheduled for removal in 2.6.35. </listitem> </orderedlist> </section> - <section> - <title>V4L2 in Linux 2.6.39</title> - <orderedlist> - <listitem> - <para>The old VIDIOC_*_OLD symbols and V4L1 support were removed.</para> - </listitem> - </orderedlist> - </section> <section id="other"> <title>Relation of V4L2 to other Linux multimedia APIs</title> diff --git a/Documentation/DocBook/v4l/v4l2.xml b/Documentation/DocBook/v4l/v4l2.xml index ae7a069d61d5..a7fd76d0dac1 100644 --- a/Documentation/DocBook/v4l/v4l2.xml +++ b/Documentation/DocBook/v4l/v4l2.xml @@ -130,17 +130,8 @@ applications. --> <revision> <revnumber>2.6.39</revnumber> <date>2011-03-01</date> - <authorinitials>mcc</authorinitials> - <revremark>Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes. - </revremark> - </revision> - - <revision> - <revnumber>2.6.38</revnumber> - <date>2011-01-16</date> - <authorinitials>po</authorinitials> - <revremark>Added the <link linkend="planar-apis">multi-planar API</link>. - </revremark> + <authorinitials>mcc, po</authorinitials> + <revremark>Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes. Added the <link linkend="planar-apis">multi-planar API</link>.</revremark> </revision> <revision> |