aboutsummaryrefslogtreecommitdiff
path: root/Documentation/DocBook/media
diff options
context:
space:
mode:
authorGravatar Hans Verkuil <hverkuil@xs4all.nl> 2015-03-15 17:54:30 -0300
committerGravatar Mauro Carvalho Chehab <mchehab@osg.samsung.com> 2015-04-02 21:13:56 -0300
commit5f853487328ba4d9d99d5be4900d804b1fdf1f15 (patch)
treeeadd491b2279f2ea3467d60a95c3de45db428fa7 /Documentation/DocBook/media
parent[media] DocBook media: fix VIDIOC_CROPCAP type description (diff)
downloadlinux-5f853487328ba4d9d99d5be4900d804b1fdf1f15.tar.gz
linux-5f853487328ba4d9d99d5be4900d804b1fdf1f15.tar.bz2
linux-5f853487328ba4d9d99d5be4900d804b1fdf1f15.zip
[media] DocBook media: fix awkward language in VIDIOC_QUERYCAP
Fix some awkward language in the VIDIOC_QUERYCAP description. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'Documentation/DocBook/media')
-rw-r--r--Documentation/DocBook/media/v4l/vidioc-querycap.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-querycap.xml b/Documentation/DocBook/media/v4l/vidioc-querycap.xml
index d0c5e604f014..20fda75a012d 100644
--- a/Documentation/DocBook/media/v4l/vidioc-querycap.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-querycap.xml
@@ -102,10 +102,10 @@ The bus_info must start with "PCI:" for PCI boards, "PCIe:" for PCI Express boar
<entry>__u32</entry>
<entry><structfield>version</structfield></entry>
<entry><para>Version number of the driver.</para>
-<para>Starting on kernel 3.1, the version reported is provided per
-V4L2 subsystem, following the same Kernel numberation scheme. However, it
-should not always return the same version as the kernel, if, for example,
-an stable or distribution-modified kernel uses the V4L2 stack from a
+<para>Starting with kernel 3.1, the version reported is provided by the
+V4L2 subsystem following the kernel numbering scheme. However, it
+may not always return the same version as the kernel if, for example,
+a stable or distribution-modified kernel uses the V4L2 stack from a
newer kernel.</para>
<para>The version number is formatted using the
<constant>KERNEL_VERSION()</constant> macro:</para></entry>