From a81519904315deeb98c5ec74839025ac144fa05d Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 6 Apr 2010 06:41:28 -0300
Subject: [PATCH] --- yaml --- r: 192947 b: refs/heads/master c:
 860553023bfed0179b3fe5d01838635f54a314a3 h: refs/heads/master i:   192945:
 da1bd9b1adfb3f5425b8dba7c71b8fa55abd620c   192943:
 21f0e72a078ca93988d1f5efa572c2271377f3fe v: v3

---
 [refs]                                               | 2 +-
 trunk/Documentation/DocBook/v4l/vidioc-queryctrl.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2fea09fedf70..257d3a1ac4c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b080c5df00e431baec09222aa8d623f0cd77314
+refs/heads/master: 860553023bfed0179b3fe5d01838635f54a314a3
diff --git a/trunk/Documentation/DocBook/v4l/vidioc-queryctrl.xml b/trunk/Documentation/DocBook/v4l/vidioc-queryctrl.xml
index 4876ff1a1a04..8e0e055ac934 100644
--- a/trunk/Documentation/DocBook/v4l/vidioc-queryctrl.xml
+++ b/trunk/Documentation/DocBook/v4l/vidioc-queryctrl.xml
@@ -325,7 +325,7 @@ should be part of the control documentation.</entry>
 	    <entry>n/a</entry>
 	    <entry>This is not a control. When
 <constant>VIDIOC_QUERYCTRL</constant> is called with a control ID
-equal to a control class code (see <xref linkend="ctrl-class" />), the
+equal to a control class code (see <xref linkend="ctrl-class" />) + 1, the
 ioctl returns the name of the control class and this control type.
 Older drivers which do not support this feature return an
 &EINVAL;.</entry>