Merge branches 'fixes' and 'ioremap' into for-linus

[cascardo/linux.git] / Documentation / DocBook / media / v4l / vidioc-enum-framesizes.xml

diff --git a/Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml b/Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml
index a78454b..9ed68ac 100644 (file)
--- a/Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml
@@ -223,7 +223,8 @@ application should zero out all members except for the
            <entry>__u32</entry>
            <entry><structfield>reserved[2]</structfield></entry>
            <entry></entry>
-           <entry>Reserved space for future use.</entry>
+           <entry>Reserved space for future use. Must be zeroed by drivers and
+           applications.</entry>
          </row>
        </tbody>
       </tgroup>