diff options
author | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
commit | 6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377 (patch) | |
tree | c250644c5adce04947d664318996de16df3f02da /Documentation/DocBook/media/v4l/vidioc-enuminput.xml | |
parent | b96516220870d8571fc12da980668687c122976e (diff) | |
parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) |
Merge branch 'master' into for-next
Diffstat (limited to 'Documentation/DocBook/media/v4l/vidioc-enuminput.xml')
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enuminput.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-enuminput.xml b/Documentation/DocBook/media/v4l/vidioc-enuminput.xml index 3c9a81305ad4..493a39a8ef21 100644 --- a/Documentation/DocBook/media/v4l/vidioc-enuminput.xml +++ b/Documentation/DocBook/media/v4l/vidioc-enuminput.xml @@ -278,11 +278,6 @@ input/output interface to linux-media@vger.kernel.org on 19 Oct 2009. &cs-def; <tbody valign="top"> <row> - <entry><constant>V4L2_IN_CAP_PRESETS</constant></entry> - <entry>0x00000001</entry> - <entry>This input supports setting DV presets by using VIDIOC_S_DV_PRESET.</entry> - </row> - <row> <entry><constant>V4L2_IN_CAP_DV_TIMINGS</constant></entry> <entry>0x00000002</entry> <entry>This input supports setting video timings by using VIDIOC_S_DV_TIMINGS.</entry> |