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

Add some ifdefs around fields only used for blackbird support, similar to the
way the dvb fields are only included with dvb support.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Reviewed-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 42e0a9b8c550..43ba75ba94b4 100644
--- 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;
-
 };
 
 /* ----------------------------------------------------------- */