X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fsaa7134%2Fsaa7134-dvb.c;h=746ec3156656aa3e9f2e53144b8e26682aa434e4;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=222a36c3891756489c20ca9b1a0c1553ed2298f2;hpb=9464c7cf61b9433057924c36e6e02f303a00e768;p=linux-2.6.git

diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 222a36c38..746ec3156 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -814,7 +814,7 @@ static int philips_tiger_pll_set(struct dvb_frontend *fe, struct dvb_frontend_pa
 	tda8290_msg.buf = tda8290_open;
 	i2c_transfer(&dev->i2c_adap, &tda8290_msg, 1);
 	return ret;
-}
+};
 
 static int philips_tiger_dvb_mode(struct dvb_frontend *fe)
 {
@@ -852,46 +852,13 @@ static struct tda1004x_config philips_tiger_config = {
 
 /* ------------------------------------------------------------------ */
 
-static int lifeview_trio_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
-{
-	int ret;
-
-	ret = philips_tda827xa_pll_set(0x60, fe, params);
-	return ret;
-}
-
-static int lifeview_trio_dvb_mode(struct dvb_frontend *fe)
-{
-	return 0;
-}
-
-static void lifeview_trio_analog_mode(struct dvb_frontend *fe)
-{
-	philips_tda827xa_pll_sleep(0x60, fe);
-}
-
-static struct tda1004x_config lifeview_trio_config = {
-	.demod_address = 0x09,
-	.invert        = 1,
-	.invert_oclk   = 0,
-	.xtal_freq     = TDA10046_XTAL_16M,
-	.agc_config    = TDA10046_AGC_TDA827X_GPL,
-	.if_freq       = TDA10046_FREQ_045,
-	.pll_init      = lifeview_trio_dvb_mode,
-	.pll_set       = lifeview_trio_pll_set,
-	.pll_sleep     = lifeview_trio_analog_mode,
-	.request_firmware = NULL,
-};
-
-/* ------------------------------------------------------------------ */
-
 static int ads_duo_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
 {
 	int ret;
 
 	ret = philips_tda827xa_pll_set(0x61, fe, params);
 	return ret;
-}
+};
 
 static int ads_duo_dvb_mode(struct dvb_frontend *fe)
 {
@@ -1052,10 +1019,6 @@ static int dvb_init(struct saa7134_dev *dev)
 		dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
 						    &dev->i2c_adap);
 		break;
-	case SAA7134_BOARD_FLYDVB_TRIO:
-		dev->dvb.frontend = tda10046_attach(&lifeview_trio_config,
-						    &dev->i2c_adap);
-		break;
 	case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:
 		dev->dvb.frontend = tda10046_attach(&ads_tech_duo_config,
 						    &dev->i2c_adap);