diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 5 | ||||
| -rw-r--r-- | v4l/ChangeLog | 20 |
2 files changed, 24 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index dec00f254..9af2034fe 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -1,5 +1,5 @@ /* - $Id: bttv-cards.c,v 1.97 2005/10/27 20:15:48 mchehab Exp $ + $Id: bttv-cards.c,v 1.98 2005/10/31 13:39:36 rmcc Exp $ bttv-cards.c @@ -3438,6 +3438,9 @@ void __devinit bttv_init_card2(struct bttv *btv) if (0 == tda9887 && 0 == bttv_tvcards[btv->c.type].has_dvb && bttv_I2CRead(btv, I2C_TDA9887, "TDA9887") >=0) tda9887 = 1; + /* Hybrid DVB card, DOES have a tda9887 */ + if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE) + tda9887 = 1; if((btv->tuner_type == TUNER_PHILIPS_FM1216ME_MK3) || (btv->tuner_type == TUNER_PHILIPS_FM1236_MK3) || (btv->tuner_type == TUNER_PHILIPS_FM1256_IH3) || diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 1c3975dc6..72c750449 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,23 @@ +2005-10-31 13:34 rmcc + + * ../linux/drivers/media/video/bttv-cards.c: + + - Work-around to allow hybrid DVB card to autoload the tda9887 + tuner module + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + +2005-10-31 13:32 rmcc + + * ../linux/drivers/media/video/bttv-i2c.c: + * ../linux/drivers/media/video/tuner-core.c: + + - Rollback recent i2c change to solve tuner detection breakage + - Fix in tuner-core to prevent setting the tuner type for an + already configured tuner + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2005-10-31 12:52 mkrufky * ../linux/drivers/media/video/cx88/cx88-tvaudio.c: |