From 65704a47f124afe19f7ed9a2dff7292a6de3ff54 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 8 Aug 2006 15:48:08 -0300
Subject: [PATCH] --- yaml --- r: 37371 b: refs/heads/master c:
 4ad8eee5ac8d8336ac7965e4a4027a7b4ec080f1 h: refs/heads/master i:   37369:
 bfb4aad57563627550c77f3d3dd3815af3c86d7d   37367:
 40e6675fa71dd8846f3916047ed00260f74c5ad2 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/cx88/cx88-dvb.c       | 3 +--
 trunk/drivers/media/video/saa7134/saa7134-dvb.c | 6 ++++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4332d34069ef..65707cb8f9f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c162dff6437d5f66c272b1811074ee32c53d17b9
+refs/heads/master: 4ad8eee5ac8d8336ac7965e4a4027a7b4ec080f1
diff --git a/trunk/drivers/media/video/cx88/cx88-dvb.c b/trunk/drivers/media/video/cx88/cx88-dvb.c
index b39b3629f1d0..52467b2ecdcb 100644
--- a/trunk/drivers/media/video/cx88/cx88-dvb.c
+++ b/trunk/drivers/media/video/cx88/cx88-dvb.c
@@ -701,8 +701,7 @@ static int dvb_register(struct cx8802_dev *dev)
 						 &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-				       &dev->core->i2c_adap,
-				       &dvb_pll_tuv1236d);
+				   NULL, &dvb_pll_tuv1236d);
 		}
 		break;
 	case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
diff --git a/trunk/drivers/media/video/saa7134/saa7134-dvb.c b/trunk/drivers/media/video/saa7134/saa7134-dvb.c
index e2d366b8fbef..fc3cae340bec 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1198,13 +1198,15 @@ static int dvb_init(struct saa7134_dev *dev)
 	case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
 		dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180, &dev->i2c_adap);
 		if (dev->dvb.frontend) {
-			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, &dev->i2c_adap, &dvb_pll_tdhu2);
+			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+				   NULL, &dvb_pll_tdhu2);
 		}
 		break;
 	case SAA7134_BOARD_KWORLD_ATSC110:
 		dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110, &dev->i2c_adap);
 		if (dev->dvb.frontend) {
-			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, &dev->i2c_adap, &dvb_pll_tuv1236d);
+			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+				   NULL, &dvb_pll_tuv1236d);
 		}
 		break;
 	case SAA7134_BOARD_FLYDVBS_LR300: