Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[mv-sheeva.git] / Documentation / DocBook / v4l / pixfmt.xml

diff --git a/Documentation/DocBook/v4l/pixfmt.xml b/Documentation/DocBook/v4l/pixfmt.xml
index 7d396a3785f5d25614635c95d019d02cfbac938e..885968d6a2fc768df6a613668ebe16c043147ee6 100644 (file)
--- a/Documentation/DocBook/v4l/pixfmt.xml
+++ b/Documentation/DocBook/v4l/pixfmt.xml
@@ -770,6 +770,11 @@ kernel sources in the file <filename>Documentation/video4linux/cx2341x/README.hm
            <entry>'S920'</entry>
            <entry>YUV 4:2:0 format of the gspca sn9c20x driver.</entry>
          </row>
+         <row id="V4L2-PIX-FMT-STV0680">
+           <entry><constant>V4L2_PIX_FMT_STV0680</constant></entry>
+           <entry>'S680'</entry>
+           <entry>Bayer format of the gspca stv0680 driver.</entry>
+         </row>
          <row id="V4L2-PIX-FMT-WNVA">
            <entry><constant>V4L2_PIX_FMT_WNVA</constant></entry>
            <entry>'WNVA'</entry>