Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[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 498a43c1f2b1595fc2352c56a5fad686d971a4a0..81cc3b00a07912bbf0d512055151c0bfbce6c509 100644 (file)
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran.h
@@ -243,10 +243,8 @@ struct zoran_format {
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
        int palette;
 #endif
-#ifdef CONFIG_VIDEO_V4L2
        __u32 fourcc;
        int colorspace;
-#endif
        int depth;
        __u32 flags;
        __u32 vfespfr;
@@ -271,20 +269,6 @@ struct zoran_v4l_settings {
        const struct zoran_format *format;      /* capture format */
 };
 
-/* whoops, this one is undeclared if !v4l2 */
-#ifndef CONFIG_VIDEO_V4L2
-struct v4l2_jpegcompression {
-       int quality;
-       int APPn;
-       int APP_len;
-       char APP_data[60];
-       int COM_len;
-       char COM_data[60];
-       __u32 jpeg_markers;
-       __u8 reserved[116];
-};
-#endif
-
 /* jpg-capture/-playback settings */
 struct zoran_jpg_settings {
        int decimation;         /* this bit is used to set everything to default */