diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DocBook/media/v4l/compat.xml | 4 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/v4l2.xml | 4 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml index ebd2bfd1ee8e..104a1a2b8849 100644 --- a/Documentation/DocBook/media/v4l/compat.xml +++ b/Documentation/DocBook/media/v4l/compat.xml | |||
@@ -2486,6 +2486,10 @@ that used it. It was originally scheduled for removal in 2.6.35. | |||
2486 | <structname>v4l2_buffer</structname>. See <xref | 2486 | <structname>v4l2_buffer</structname>. See <xref |
2487 | linkend="buffer-flags" />.</para> | 2487 | linkend="buffer-flags" />.</para> |
2488 | </listitem> | 2488 | </listitem> |
2489 | <listitem> | ||
2490 | <para>Added <constant>V4L2_EVENT_CTRL_CH_RANGE</constant> control event | ||
2491 | changes flag. See <xref linkend="changes-flags"/>.</para> | ||
2492 | </listitem> | ||
2489 | </orderedlist> | 2493 | </orderedlist> |
2490 | </section> | 2494 | </section> |
2491 | 2495 | ||
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml index 8fe29427c8e4..c3851a2fb50d 100644 --- a/Documentation/DocBook/media/v4l/v4l2.xml +++ b/Documentation/DocBook/media/v4l/v4l2.xml | |||
@@ -142,10 +142,12 @@ applications. --> | |||
142 | <revision> | 142 | <revision> |
143 | <revnumber>3.9</revnumber> | 143 | <revnumber>3.9</revnumber> |
144 | <date>2012-12-03</date> | 144 | <date>2012-12-03</date> |
145 | <authorinitials>sa</authorinitials> | 145 | <authorinitials>sa, sn</authorinitials> |
146 | <revremark>Added timestamp types to | 146 | <revremark>Added timestamp types to |
147 | <structname>v4l2_buffer</structname>, see <xref | 147 | <structname>v4l2_buffer</structname>, see <xref |
148 | linkend="buffer-flags" />. | 148 | linkend="buffer-flags" />. |
149 | Added <constant>V4L2_EVENT_CTRL_CH_RANGE</constant> control | ||
150 | event changes flag, see <xref linkend="changes-flags"/>. | ||
149 | </revremark> | 151 | </revremark> |
150 | </revision> | 152 | </revision> |
151 | 153 | ||
diff --git a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml index 98a856f9ec30..89891adb928a 100644 --- a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml +++ b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml | |||
@@ -261,6 +261,12 @@ | |||
261 | <entry>This control event was triggered because the control flags | 261 | <entry>This control event was triggered because the control flags |
262 | changed.</entry> | 262 | changed.</entry> |
263 | </row> | 263 | </row> |
264 | <row> | ||
265 | <entry><constant>V4L2_EVENT_CTRL_CH_RANGE</constant></entry> | ||
266 | <entry>0x0004</entry> | ||
267 | <entry>This control event was triggered because the minimum, | ||
268 | maximum, step or the default value of the control changed.</entry> | ||
269 | </row> | ||
264 | </tbody> | 270 | </tbody> |
265 | </tgroup> | 271 | </tgroup> |
266 | </table> | 272 | </table> |