diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:29:47 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:29:47 -0200 |
| commit | c3e004458c858a5cea7dc5a693c25b301c0a47a8 (patch) | |
| tree | b7aced58dd900d9afd01531ffefd1b00dffda92c /linux/drivers/media/video/ivtv/ivtv-driver.h | |
| parent | df971dfe066837946222937b94068df80d1270f2 (diff) | |
| parent | 73718ca8bbd9619f9d42780499c63b32fd074052 (diff) | |
| download | mediapointer-dvb-s2-c3e004458c858a5cea7dc5a693c25b301c0a47a8.tar.gz mediapointer-dvb-s2-c3e004458c858a5cea7dc5a693c25b301c0a47a8.tar.bz2 | |
merge backout patch
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-driver.h')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h index 8b0074624..5b2bd0be0 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.h +++ b/linux/drivers/media/video/ivtv/ivtv-driver.h @@ -600,13 +600,13 @@ struct ivtv { struct pci_dev *dev; /* PCI device */ const struct ivtv_card *card; /* card information */ const char *card_name; /* full name of the card */ + const struct ivtv_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */ u8 has_cx23415; /* 1 if it is a cx23415 based card, 0 for cx23416 */ u8 pvr150_workaround; /* 1 if the cx25840 needs to workaround a PVR150 bug */ u8 nof_inputs; /* number of video inputs */ u8 nof_audio_inputs; /* number of audio inputs */ u32 v4l2_cap; /* V4L2 capabilities of card */ u32 hw_flags; /* hardware description of the board */ - int tunerid; /* userspace tuner ID for experimental Xceive tuner support */ v4l2_std_id tuner_std; /* the norm of the card's tuner (fixed) */ /* controlling video decoder function */ int (*video_dec_func)(struct ivtv *, unsigned int, void *); |