Merge branch 'thinkpad-2.6.32-part2' into release

[platform/kernel/linux-starfive.git] / Documentation / DocBook / v4l / pixfmt.xml

diff --git a/Documentation/DocBook/v4l/pixfmt.xml b/Documentation/DocBook/v4l/pixfmt.xml
index ebfbed0..7d396a3 100644 (file)
--- a/Documentation/DocBook/v4l/pixfmt.xml
+++ b/Documentation/DocBook/v4l/pixfmt.xml
@@ -777,6 +777,11 @@ kernel sources in the file <filename>Documentation/video4linux/cx2341x/README.hm
 url="http://www.thedirks.org/winnov/">
 http://www.thedirks.org/winnov/</ulink></para></entry>
          </row>
+         <row id="V4L2-PIX-FMT-TM6000">
+           <entry><constant>V4L2_PIX_FMT_TM6000</constant></entry>
+           <entry>'TM60'</entry>
+           <entry><para>Used by Trident tm6000</para></entry>
+         </row>
          <row id="V4L2-PIX-FMT-YYUV">
            <entry><constant>V4L2_PIX_FMT_YYUV</constant></entry>
            <entry>'YYUV'</entry>