From 7f85b0b14332669312cf322c5aaf3d913985d48c Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 22 Apr 2008 14:46:19 -0300
Subject: [PATCH] --- yaml --- r: 92543 b: refs/heads/master c:
 ad561caafaa02b2e1dfe25f6bae03806051992eb h: refs/heads/master i:   92541:
 62f4da0be8d077ff49b14ff74307e17e3c15ed1b   92539:
 49a18c75e45092f8acfd20a20beb0c46b84f8ad3   92535:
 603e059716529e001d3aeeeec2e9273f9f369ece   92527:
 5df17fac357562813a3bffc9573be6198e98fbe0   92511:
 9031084b0ea8e11c050162942a0d8a3e864ec5ba   92479:
 a78a6081e938e68dc0d6effd642ba50648684b31   92415:
 e2d8c90b1617a6f3eb8f1fce2f7cee49f9244ef9 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/dvb/frontends/dvb-pll.c | 43 ---------------------
 trunk/drivers/media/dvb/frontends/dvb-pll.h |  1 -
 3 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/[refs] b/[refs]
index 1a68483dc445..025e20a5c9f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92d1069f3cfbe4da07d9cf5b1cb29930e6277def
+refs/heads/master: ad561caafaa02b2e1dfe25f6bae03806051992eb
diff --git a/trunk/drivers/media/dvb/frontends/dvb-pll.c b/trunk/drivers/media/dvb/frontends/dvb-pll.c
index 7735e7484e78..b2491f106cef 100644
--- a/trunk/drivers/media/dvb/frontends/dvb-pll.c
+++ b/trunk/drivers/media/dvb/frontends/dvb-pll.c
@@ -374,48 +374,6 @@ static struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261 = {
 	},
 };
 
-/*
- * Philips TD1316 Tuner.
- */
-static void td1316_bw(struct dvb_frontend *fe, u8 *buf,
-		      const struct dvb_frontend_parameters *params)
-{
-	u8 band;
-
-	/* determine band */
-	if (params->frequency < 161000000)
-		band = 1;
-	else if (params->frequency < 444000000)
-		band = 2;
-	else
-		band = 4;
-
-	buf[3] |= band;
-
-	/* setup PLL filter */
-	if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ)
-		buf[3] |= 1 << 3;
-}
-
-static struct dvb_pll_desc dvb_pll_philips_td1316 = {
-	.name  = "Philips TD1316",
-	.min   =  87000000,
-	.max   = 895000000,
-	.iffreq= 36166667,
-	.set   = td1316_bw,
-	.count = 9,
-	.entries = {
-		{  93834000, 166667, 0xca, 0x60},
-		{ 123834000, 166667, 0xca, 0xa0},
-		{ 163834000, 166667, 0xca, 0xc0},
-		{ 253834000, 166667, 0xca, 0x60},
-		{ 383834000, 166667, 0xca, 0xa0},
-		{ 443834000, 166667, 0xca, 0xc0},
-		{ 583834000, 166667, 0xca, 0x60},
-		{ 793834000, 166667, 0xca, 0xa0},
-		{ 858834000, 166667, 0xca, 0xe0},
-	},
-};
 
 
 static void opera1_bw(struct dvb_frontend *fe, u8 *buf,
@@ -462,7 +420,6 @@ static struct dvb_pll_desc *pll_list[] = {
 	[DVB_PLL_TDHU2]                  = &dvb_pll_tdhu2,
 	[DVB_PLL_SAMSUNG_TBMV]           = &dvb_pll_samsung_tbmv,
 	[DVB_PLL_PHILIPS_SD1878_TDA8261] = &dvb_pll_philips_sd1878_tda8261,
-	[DVB_PLL_PHILIPS_TD1316]         = &dvb_pll_philips_td1316,
 	[DVB_PLL_OPERA1]                 = &dvb_pll_opera1,
 };
 
diff --git a/trunk/drivers/media/dvb/frontends/dvb-pll.h b/trunk/drivers/media/dvb/frontends/dvb-pll.h
index 48cd41fac1e1..8736ccb9954b 100644
--- a/trunk/drivers/media/dvb/frontends/dvb-pll.h
+++ b/trunk/drivers/media/dvb/frontends/dvb-pll.h
@@ -22,7 +22,6 @@
 #define DVB_PLL_TDHU2                  16
 #define DVB_PLL_SAMSUNG_TBMV           17
 #define DVB_PLL_PHILIPS_SD1878_TDA8261 18
-#define DVB_PLL_PHILIPS_TD1316         19
 #define DVB_PLL_OPERA1                 21
 
 /**