Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / include / linux / v4l2-mediabus.h

diff --git a/include/linux/v4l2-mediabus.h b/include/linux/v4l2-mediabus.h
index 5c64924..7054a7a 100644 (file)
--- a/include/linux/v4l2-mediabus.h
+++ b/include/linux/v4l2-mediabus.h
@@ -67,7 +67,7 @@ enum v4l2_mbus_pixelcode {
        V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d,
        V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e,
 
-       /* Bayer - next is 0x3010 */
+       /* Bayer - next is 0x3013 */
        V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001,
        V4L2_MBUS_FMT_SGRBG8_1X8 = 0x3002,
        V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 = 0x300b,
@@ -83,6 +83,9 @@ enum v4l2_mbus_pixelcode {
        V4L2_MBUS_FMT_SGRBG10_1X10 = 0x300a,
        V4L2_MBUS_FMT_SRGGB10_1X10 = 0x300f,
        V4L2_MBUS_FMT_SBGGR12_1X12 = 0x3008,
+       V4L2_MBUS_FMT_SGBRG12_1X12 = 0x3010,
+       V4L2_MBUS_FMT_SGRBG12_1X12 = 0x3011,
+       V4L2_MBUS_FMT_SRGGB12_1X12 = 0x3012,
 };
 
 /**