summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/bttv-cards.c')
-rw-r--r--linux/drivers/media/video/bttv-cards.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index f4c7b1a01..b81d9d9d7 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.38 2004/12/10 12:33:39 kraxel Exp $
+ $Id: bttv-cards.c,v 1.39 2004/12/14 15:33:29 kraxel Exp $
bttv-cards.c
@@ -2864,6 +2864,7 @@ static void modtec_eeprom(struct bttv *btv)
static void __devinit hauppauge_eeprom(struct bttv *btv)
{
+#if 0
unsigned int blk2,tuner,radio,model;
if (eeprom_data[0] != 0x84 || eeprom_data[2] != 0)
@@ -2889,6 +2890,13 @@ static void __devinit hauppauge_eeprom(struct bttv *btv)
btv->c.nr, model, (tuner < ARRAY_SIZE(hauppauge_tuner)
? hauppauge_tuner[tuner].name : "?"),
btv->tuner_type, radio ? "yes" : "no");
+#else
+ struct tveeprom tv;
+
+ tveeprom_hauppauge_analog(&tv, eeprom_data);
+ btv->tuner_type = tv.tuner_type;
+ btv->has_radio = tv.has_radio;
+#endif
}
static int terratec_active_radio_upgrade(struct bttv *btv)