summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/v4l/pixfmt.xml
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-05-19 09:00:06 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-05-19 09:00:06 +0200
commit4c8440666b995f20604852b35dcfdbcc1d5931f1 (patch)
treeb3b6cd65ee275ba1adf9d2c050063f30ebbadb91 /Documentation/DocBook/v4l/pixfmt.xml
parentpowerpc: Remove unused/obsolete CONFIG_XICS (diff)
parentpowerpc/4xx: Fix regression in SMP on 476 (diff)
downloadlinux-4c8440666b995f20604852b35dcfdbcc1d5931f1.tar.xz
linux-4c8440666b995f20604852b35dcfdbcc1d5931f1.zip
Merge branch 'merge' into next
Diffstat (limited to 'Documentation/DocBook/v4l/pixfmt.xml')
-rw-r--r--Documentation/DocBook/v4l/pixfmt.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/DocBook/v4l/pixfmt.xml b/Documentation/DocBook/v4l/pixfmt.xml
index c6fdcbbd1b41..40af4beb48b9 100644
--- a/Documentation/DocBook/v4l/pixfmt.xml
+++ b/Documentation/DocBook/v4l/pixfmt.xml
@@ -696,6 +696,7 @@ information.</para>
&sub-packed-yuv;
&sub-grey;
&sub-y10;
+ &sub-y12;
&sub-y16;
&sub-yuyv;
&sub-uyvy;