diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:09:18 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:09:18 -0400 |
commit | 68fe0f0a6dcd2ac1ace5da3647a6d1cf0f4d2fea (patch) | |
tree | 69d855c2e46d42ef8f23680cf3a1e6ff38de9ef4 /Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml | |
parent | 88fd449e734a4264347e12b8ff74ccb33a9b9a35 (diff) | |
parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) |
Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes
Diffstat (limited to 'Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml')
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml b/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml index 24c3bf4fd29..b3e17c1dfaf 100644 --- a/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml +++ b/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml | |||
@@ -106,6 +106,12 @@ application.</entry> | |||
106 | is out of bounds.</para> | 106 | is out of bounds.</para> |
107 | </listitem> | 107 | </listitem> |
108 | </varlistentry> | 108 | </varlistentry> |
109 | <varlistentry> | ||
110 | <term><errorcode>ENODATA</errorcode></term> | ||
111 | <listitem> | ||
112 | <para>Digital video presets are not supported for this input or output.</para> | ||
113 | </listitem> | ||
114 | </varlistentry> | ||
109 | </variablelist> | 115 | </variablelist> |
110 | </refsect1> | 116 | </refsect1> |
111 | </refentry> | 117 | </refentry> |