diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 11:06:26 +0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 11:06:26 +0400 |
commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
tree | 8b639000418e2756bf6baece4e00e07d2534bccc /Documentation/DocBook/v4l/func-munmap.xml | |
parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (diff) | |
download | linux-b73077eb03f510a84b102fb97640e595a958403c.tar.xz |
Merge branch 'next' into for-linus
Diffstat (limited to 'Documentation/DocBook/v4l/func-munmap.xml')
-rw-r--r-- | Documentation/DocBook/v4l/func-munmap.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/DocBook/v4l/func-munmap.xml b/Documentation/DocBook/v4l/func-munmap.xml index 502ed49323b0..e2c4190f9bb6 100644 --- a/Documentation/DocBook/v4l/func-munmap.xml +++ b/Documentation/DocBook/v4l/func-munmap.xml @@ -37,7 +37,8 @@ <para>Length of the mapped buffer. This must be the same value as given to <function>mmap()</function> and returned by the driver in the &v4l2-buffer; <structfield>length</structfield> -field.</para> +field for the single-planar API and in the &v4l2-plane; +<structfield>length</structfield> field for the multi-planar API.</para> </listitem> </varlistentry> </variablelist> |