From c880eadd6301903875ed47036a96a796419579bc Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 11 Sep 2010 08:36:55 -0300
Subject: [PATCH] --- yaml --- r: 219109 b: refs/heads/master c:
 5e765c6e445da16527a04aa3931f21e5deb476d8 h: refs/heads/master i:   219107:
 307078b8633cd116ee381cb8b0e08e6db4e82f9f v: v3

---
 [refs]                                                     | 2 +-
 trunk/Documentation/DocBook/v4l/pixfmt.xml                 | 4 ++--
 trunk/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml     | 3 +--
 trunk/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml    | 3 +--
 trunk/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 638d9c56543d..5c7c83c83a35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47399d98e79c7fd4fac0e2457db26f3842ecb990
+refs/heads/master: 5e765c6e445da16527a04aa3931f21e5deb476d8
diff --git a/trunk/Documentation/DocBook/v4l/pixfmt.xml b/trunk/Documentation/DocBook/v4l/pixfmt.xml
index 5376aefeeffc..f4cc0a9e658e 100644
--- a/trunk/Documentation/DocBook/v4l/pixfmt.xml
+++ b/trunk/Documentation/DocBook/v4l/pixfmt.xml
@@ -787,14 +787,14 @@ http://www.thedirks.org/winnov/</ulink></para></entry>
 	    <entry>'TM60'</entry>
 	    <entry><para>Used by Trident tm6000</para></entry>
 	  </row>
-	  <row id="V4L2_PIX_FMT_CIT_YYVYUY">
+	  <row id="V4L2-PIX-FMT-CIT-YYVYUY">
 	    <entry><constant>V4L2_PIX_FMT_CIT_YYVYUY</constant></entry>
 	    <entry>'CITV'</entry>
 	    <entry><para>Used by xirlink CIT, found at IBM webcams.</para>
 	           <para>Uses one line of Y then 1 line of VYUY</para>
 	    </entry>
 	  </row>
-	  <row id="V4L2_PIX_FMT_KONICA420">
+	  <row id="V4L2-PIX-FMT-KONICA420">
 	    <entry><constant>V4L2_PIX_FMT_KONICA420</constant></entry>
 	    <entry>'KONI'</entry>
 	    <entry><para>Used by Konica webcams.</para>
diff --git a/trunk/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml b/trunk/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml
index 3c6784e132f3..d733721a7519 100644
--- a/trunk/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml
+++ b/trunk/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml
@@ -16,8 +16,7 @@
 	<funcdef>int <function>ioctl</function></funcdef>
 	<paramdef>int <parameter>fd</parameter></paramdef>
 	<paramdef>int <parameter>request</parameter></paramdef>
-	<paramdef>&v4l2-dv-preset;
-*<parameter>argp</parameter></paramdef>
+	<paramdef>struct v4l2_dv_preset *<parameter>argp</parameter></paramdef>
       </funcprototype>
     </funcsynopsis>
   </refsynopsisdiv>
diff --git a/trunk/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml b/trunk/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml
index ecc19576bb8f..d5ec6abf0ce2 100644
--- a/trunk/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml
+++ b/trunk/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml
@@ -16,8 +16,7 @@
 	<funcdef>int <function>ioctl</function></funcdef>
 	<paramdef>int <parameter>fd</parameter></paramdef>
 	<paramdef>int <parameter>request</parameter></paramdef>
-	<paramdef>&v4l2-dv-timings;
-*<parameter>argp</parameter></paramdef>
+	<paramdef>struct v4l2_dv_timings *<parameter>argp</parameter></paramdef>
       </funcprototype>
     </funcsynopsis>
   </refsynopsisdiv>
diff --git a/trunk/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml b/trunk/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
index 402229ee06f6..d272f7ab91b8 100644
--- a/trunk/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
+++ b/trunk/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
@@ -16,7 +16,7 @@ input</refpurpose>
 	<funcdef>int <function>ioctl</function></funcdef>
 	<paramdef>int <parameter>fd</parameter></paramdef>
 	<paramdef>int <parameter>request</parameter></paramdef>
-	<paramdef>&v4l2-dv-preset; *<parameter>argp</parameter></paramdef>
+	<paramdef>struct v4l2_dv_preset *<parameter>argp</parameter></paramdef>
       </funcprototype>
     </funcsynopsis>
   </refsynopsisdiv>