V4L/DVB (6332): cx88: Only include the blackbird fields if blackbird is selected

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

diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 42e0a9b8c55006f4770a3de97e41f86eb3d1a882..43ba75ba94b4e9f9080d6eafc020e757dbd11dce 100644 (file)
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -453,11 +453,17 @@ struct cx8802_dev {
 
        /* for blackbird only */
        struct list_head           devlist;
+#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \
+    defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE)
        struct video_device        *mpeg_dev;
        u32                        mailbox;
        int                        width;
        int                        height;
 
+       /* mpeg params */
+       struct cx2341x_mpeg_params params;
+#endif
+
 #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
        /* for dvb only */
        struct videobuf_dvb        dvb;
@@ -467,13 +473,9 @@ struct cx8802_dev {
        /* for switching modulation types */
        unsigned char              ts_gen_cntrl;
 
-       /* mpeg params */
-       struct cx2341x_mpeg_params params;
-
        /* List of attached drivers */
        struct cx8802_driver       drvlist;
        struct work_struct request_module_wk;
-
 };
 
 /* ----------------------------------------------------------- */