aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx88/cx88.h')
-rw-r--r--drivers/media/video/cx88/cx88.h10
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 {
453 453
454 /* for blackbird only */ 454 /* for blackbird only */
455 struct list_head devlist; 455 struct list_head devlist;
456#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \
457 defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE)
456 struct video_device *mpeg_dev; 458 struct video_device *mpeg_dev;
457 u32 mailbox; 459 u32 mailbox;
458 int width; 460 int width;
459 int height; 461 int height;
460 462
463 /* mpeg params */
464 struct cx2341x_mpeg_params params;
465#endif
466
461#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) 467#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
462 /* for dvb only */ 468 /* for dvb only */
463 struct videobuf_dvb dvb; 469 struct videobuf_dvb dvb;
@@ -467,13 +473,9 @@ struct cx8802_dev {
467 /* for switching modulation types */ 473 /* for switching modulation types */
468 unsigned char ts_gen_cntrl; 474 unsigned char ts_gen_cntrl;
469 475
470 /* mpeg params */
471 struct cx2341x_mpeg_params params;
472
473 /* List of attached drivers */ 476 /* List of attached drivers */
474 struct cx8802_driver drvlist; 477 struct cx8802_driver drvlist;
475 struct work_struct request_module_wk; 478 struct work_struct request_module_wk;
476
477}; 479};
478 480
479/* ----------------------------------------------------------- */ 481/* ----------------------------------------------------------- */