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.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 738d4f20c580..c4f656ec46b0 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -209,6 +209,7 @@ extern struct sram_channel cx88_sram_channels[];
209#define CX88_BOARD_NORWOOD_MICRO 54 209#define CX88_BOARD_NORWOOD_MICRO 54
210#define CX88_BOARD_TE_DTV_250_OEM_SWANN 55 210#define CX88_BOARD_TE_DTV_250_OEM_SWANN 55
211#define CX88_BOARD_HAUPPAUGE_HVR1300 56 211#define CX88_BOARD_HAUPPAUGE_HVR1300 56
212#define CX88_BOARD_ADSTECH_PTV_390 57
212 213
213enum cx88_itype { 214enum cx88_itype {
214 CX88_VMUX_COMPOSITE1 = 1, 215 CX88_VMUX_COMPOSITE1 = 1,
@@ -316,8 +317,6 @@ struct cx88_core {
316 317
317 /* config info -- dvb */ 318 /* config info -- dvb */
318#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) 319#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
319 struct dvb_pll_desc *pll_desc;
320 unsigned int pll_addr;
321 int (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage); 320 int (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
322#endif 321#endif
323 322
@@ -463,13 +462,10 @@ struct cx8802_dev {
463 u32 mailbox; 462 u32 mailbox;
464 int width; 463 int width;
465 int height; 464 int height;
466 int fw_size;
467 465
468#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) 466#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
469 /* for dvb only */ 467 /* for dvb only */
470 struct videobuf_dvb dvb; 468 struct videobuf_dvb dvb;
471 void* fe_handle;
472 int (*fe_release)(void *handle);
473 469
474 void *card_priv; 470 void *card_priv;
475#endif 471#endif