aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-driver.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-12-07 19:01:15 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:03:24 -0500
commitd9009201207c4bdce9b95a0bd903b3f087e8eda1 (patch)
tree86801fb674777c7a4693622363ac18a7a7896ec1 /drivers/media/video/ivtv/ivtv-driver.h
parent9d1a16a4fc39bd908d85e0b7ce167048200d2d2b (diff)
V4L/DVB (6765): ivtv: convert to bus-based i2c API
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.h')
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 19a9b3bac190..8eeea3a0c700 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -590,13 +590,13 @@ struct ivtv {
590 struct pci_dev *dev; /* PCI device */ 590 struct pci_dev *dev; /* PCI device */
591 const struct ivtv_card *card; /* card information */ 591 const struct ivtv_card *card; /* card information */
592 const char *card_name; /* full name of the card */ 592 const char *card_name; /* full name of the card */
593 const struct ivtv_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */
593 u8 has_cx23415; /* 1 if it is a cx23415 based card, 0 for cx23416 */ 594 u8 has_cx23415; /* 1 if it is a cx23415 based card, 0 for cx23416 */
594 u8 pvr150_workaround; /* 1 if the cx25840 needs to workaround a PVR150 bug */ 595 u8 pvr150_workaround; /* 1 if the cx25840 needs to workaround a PVR150 bug */
595 u8 nof_inputs; /* number of video inputs */ 596 u8 nof_inputs; /* number of video inputs */
596 u8 nof_audio_inputs; /* number of audio inputs */ 597 u8 nof_audio_inputs; /* number of audio inputs */
597 u32 v4l2_cap; /* V4L2 capabilities of card */ 598 u32 v4l2_cap; /* V4L2 capabilities of card */
598 u32 hw_flags; /* hardware description of the board */ 599 u32 hw_flags; /* hardware description of the board */
599 int tunerid; /* userspace tuner ID for experimental Xceive tuner support */
600 v4l2_std_id tuner_std; /* the norm of the card's tuner (fixed) */ 600 v4l2_std_id tuner_std; /* the norm of the card's tuner (fixed) */
601 /* controlling video decoder function */ 601 /* controlling video decoder function */
602 int (*video_dec_func)(struct ivtv *, unsigned int, void *); 602 int (*video_dec_func)(struct ivtv *, unsigned int, void *);