Merge git://git.infradead.org/~kmpark/onenand-mtd-2.6

[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 ffcda95ed9d4720eba3dcfb16f1e6a473cd29e86..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
@@ -267,7 +272,7 @@ struct zoran_v4l_settings {
 };
 
 /* whoops, this one is undeclared if !v4l2 */
-#ifndef HAVE_V4L2
+#ifndef CONFIG_VIDEO_V4L2
 struct v4l2_jpegcompression {
        int quality;
        int APPn;