- tda9887: rollback secam fixup for now ...

1 files changed, 3 insertions, 13 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index e44e43ab2..fc43a3af7 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-cards.c,v 1.58 2005/01/31 11:35:05 kraxel Exp $
+ * $Id: cx88-cards.c,v 1.59 2005/02/04 11:42:14 kraxel Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * card-specific stuff.
@@ -648,19 +648,14 @@ static int hauppauge_eeprom_dvb(struct cx88_core *core, u8 *ee)
 	switch(tuner) {
 	case 0x4B: /* dtt 7595 */
 	case 0x4C: /* dtt 7592 */
-		core->pll_desc = &dvb_pll_thomson_dtt759x;
 		break;
 	default:
 		printk("%s: error: unknown hauppauge tuner 0x%02x\n",
 		       core->name, tuner);
 		return -ENODEV;
 	}
-	printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%d (%s)\n",
-	       core->name, model, tuner,
-	       core->pll_desc ? core->pll_desc->name : "UNKNOWN");
-
-	core->pll_addr   = 0x61;
-	core->demod_addr = 0x43;
+	printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%d\n",
+	       core->name, model, tuner);
 }
 #endif
 
@@ -770,11 +765,6 @@ void cx88_card_setup(struct cx88_core *core)
 		if (0 == core->i2c_rc)
 			hauppauge_eeprom_dvb(core,eeprom);
 		break;
-	case CX88_BOARD_CONEXANT_DVB_T1:
-		core->pll_desc   = &dvb_pll_thomson_dtt7579;
-		core->pll_addr   = 0x60;
-		core->demod_addr = 0x43;
-		break;
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
 		/* GPIO0:0 is hooked to mt352 reset pin */
 		cx_set(MO_GP0_IO, 0x00000101);