V4L/DVB (5890): zr36067: Add UYVY, RGB555X, RGB565X, and RGB32 formats

[linux-2.6-omap-h63xx.git] / drivers / media / video / zoran.h

diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h
index 8fb4a3414e0a7441d0f13ca3749bc551051447d1..937c4a616c0e3fbb7e9244de9e25d4b103aac12a 100644 (file)
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran.h
@@ -240,11 +240,16 @@ enum gpcs_type {
 
 struct zoran_format {
        char *name;
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
        int palette;
+#endif
+#ifdef CONFIG_VIDEO_V4L2
        __u32 fourcc;
        int colorspace;
+#endif
        int depth;
        __u32 flags;
+       __u32 vfespfr;
 };
 /* flags */
 #define ZORAN_FORMAT_COMPRESSED 1<<0