Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h
index 937c4a616c0e3fbb7e9244de9e25d4b103aac12a..81cc3b00a07912bbf0d512055151c0bfbce6c509 100644 (file)
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran.h
@@ -221,15 +221,15 @@ enum zoran_map_mode {
 };
 
 enum gpio_type {
-       GPIO_JPEG_SLEEP = 0,
-       GPIO_JPEG_RESET,
-       GPIO_JPEG_FRAME,
-       GPIO_VID_DIR,
-       GPIO_VID_EN,
-       GPIO_VID_RESET,
-       GPIO_CLK_SEL1,
-       GPIO_CLK_SEL2,
-       GPIO_MAX,
+       ZR_GPIO_JPEG_SLEEP = 0,
+       ZR_GPIO_JPEG_RESET,
+       ZR_GPIO_JPEG_FRAME,
+       ZR_GPIO_VID_DIR,
+       ZR_GPIO_VID_EN,
+       ZR_GPIO_VID_RESET,
+       ZR_GPIO_CLK_SEL1,
+       ZR_GPIO_CLK_SEL2,
+       ZR_GPIO_MAX,
 };
 
 enum gpcs_type {
@@ -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 */
@@ -378,11 +362,11 @@ struct card_info {
 
        u32 jpeg_int;           /* JPEG interrupt */
        u32 vsync_int;          /* VSYNC interrupt */
-       s8 gpio[GPIO_MAX];
+       s8 gpio[ZR_GPIO_MAX];
        u8 gpcs[GPCS_MAX];
 
        struct vfe_polarity vfe_pol;
-       u8 gpio_pol[GPIO_MAX];
+       u8 gpio_pol[ZR_GPIO_MAX];
 
        /* is the /GWS line conected? */
        u8 gws_not_connected;