From 8827e861adfa10c7fcf192fd69b8dd5a3d6703c2 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 22 Apr 2008 14:46:13 -0300
Subject: [PATCH] --- yaml --- r: 92531 b: refs/heads/master c:
 967be9a9cd2de3f87dbf960620860143a50c1b64 h: refs/heads/master i:   92529:
 edb672861c9a4e02ae2ca3b6cac5b8552170bf92   92527:
 5df17fac357562813a3bffc9573be6198e98fbe0 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 5 +++--
 trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h | 1 +
 trunk/drivers/media/video/bt8xx/bttv.h    | 1 +
 trunk/drivers/media/video/bt8xx/bttvp.h   | 1 -
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 340465a20494..6ad73f9dc14a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0efad8127ac4b32af780d722258b42cfae02cdf2
+refs/heads/master: 967be9a9cd2de3f87dbf960620860143a50c1b64
diff --git a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 209356be5828..6d8b84490fa8 100644
--- a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -692,8 +692,9 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
 	case BTTV_BOARD_PC_HDTV:
 		card->fe = dvb_attach(or51211_attach, &or51211_config, card->i2c_adapter);
 		if (card->fe != NULL)
-			dvb_attach(dvb_pll_attach, card->fe, 0x61,
-				   card->i2c_adapter, DVB_PLL_FCV1236D);
+			dvb_attach(simple_tuner_attach, card->fe,
+				   card->i2c_adapter, 0x61,
+				   TUNER_PHILIPS_FCV1236D);
 		break;
 	}
 
diff --git a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index 436880e68672..25a23c3c7c66 100644
--- a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -39,6 +39,7 @@
 #include "lgdt330x.h"
 #include "zl10353.h"
 #include "dvb-pll.h"
+#include "tuner-simple.h"
 
 struct dvb_bt8xx_card {
 	struct mutex lock;
diff --git a/trunk/drivers/media/video/bt8xx/bttv.h b/trunk/drivers/media/video/bt8xx/bttv.h
index 0c859d949c78..f2393202904b 100644
--- a/trunk/drivers/media/video/bt8xx/bttv.h
+++ b/trunk/drivers/media/video/bt8xx/bttv.h
@@ -19,6 +19,7 @@
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
 #include <media/i2c-addr.h>
+#include <media/tuner.h>
 
 /* ---------------------------------------------------------- */
 /* exported by bttv-cards.c                                   */
diff --git a/trunk/drivers/media/video/bt8xx/bttvp.h b/trunk/drivers/media/video/bt8xx/bttvp.h
index 1305d315cfc5..03816b73f847 100644
--- a/trunk/drivers/media/video/bt8xx/bttvp.h
+++ b/trunk/drivers/media/video/bt8xx/bttvp.h
@@ -42,7 +42,6 @@
 
 #include <linux/device.h>
 #include <media/videobuf-dma-sg.h>
-#include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/ir-common.h>