diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-15 16:22:06 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-15 16:22:06 -0200 |
| commit | 2bd35cda866389fda170f211d63bfd4893a7b464 (patch) | |
| tree | 114fde96970c0a5b073da965b9de4386a6ea7822 /linux/drivers/media/video/cx88/cx88.h | |
| parent | 213eb0168addbe7f314724f01c9f7ddad3ee2673 (diff) | |
| parent | 7f367712814cef0e1e132c2c39363cb0c6adb557 (diff) | |
| download | mediapointer-dvb-s2-2bd35cda866389fda170f211d63bfd4893a7b464.tar.gz mediapointer-dvb-s2-2bd35cda866389fda170f211d63bfd4893a7b464.tar.bz2 | |
merge http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88.h')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 3d80c259b..4ed19fb37 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -441,7 +441,9 @@ struct cx8802_suspend_state { struct cx8802_driver { struct cx88_core *core; - struct list_head devlist; + + /* List of drivers attached to device */ + struct list_head drvlist; /* Type of driver and access required */ enum cx88_board_type type_id; @@ -486,27 +488,33 @@ 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; +#endif - void *card_priv; +#if defined(CONFIG_VIDEO_CX88_VP3054) || \ + defined(CONFIG_VIDEO_CX88_VP3054_MODULE) + /* For VP3045 secondary I2C bus support */ + struct vp3054_i2c_state *vp3054; #endif /* 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; - + struct list_head drvlist; + struct work_struct request_module_wk; }; /* ----------------------------------------------------------- */ |