From 603e059716529e001d3aeeeec2e9273f9f369ece Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Tue, 22 Apr 2008 14:46:17 -0300 Subject: [PATCH] --- yaml --- r: 92535 b: refs/heads/master c: 62ff817a04a5a08074c0391bdbf7bab48bdaa80e h: refs/heads/master i: 92533: 3b5c6214de46dadd97095420c3e41fcda9cf6530 92531: 8827e861adfa10c7fcf192fd69b8dd5a3d6703c2 92527: 5df17fac357562813a3bffc9573be6198e98fbe0 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-dvb.c | 5 +++-- trunk/drivers/media/video/saa7134/saa7134-dvb.c | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b5bdde285d76..fb6750e000a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb147e9755055b1b73b22c3efe87bec075ad3caa +refs/heads/master: 62ff817a04a5a08074c0391bdbf7bab48bdaa80e diff --git a/trunk/drivers/media/video/cx88/cx88-dvb.c b/trunk/drivers/media/video/cx88/cx88-dvb.c index 676cf7ce08f2..8dca20b944dd 100644 --- a/trunk/drivers/media/video/cx88/cx88-dvb.c +++ b/trunk/drivers/media/video/cx88/cx88-dvb.c @@ -731,8 +731,9 @@ static int dvb_register(struct cx8802_dev *dev) &ati_hdtvwonder, &dev->core->i2c_adap); if (dev->dvb.frontend != NULL) { - dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, - NULL, DVB_PLL_TUV1236D); + dvb_attach(simple_tuner_attach, dev->dvb.frontend, + &dev->core->i2c_adap, 0x61, + TUNER_PHILIPS_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 16ea09a87283..9f8730bc6e5f 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-dvb.c +++ b/trunk/drivers/media/video/saa7134/saa7134-dvb.c @@ -1085,8 +1085,9 @@ static int dvb_init(struct saa7134_dev *dev) dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110, &dev->i2c_adap); if (dev->dvb.frontend) { - dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, - NULL, DVB_PLL_TUV1236D); + dvb_attach(simple_tuner_attach, dev->dvb.frontend, + &dev->i2c_adap, 0x61, + TUNER_PHILIPS_TUV1236D); } break; case SAA7134_BOARD_FLYDVBS_LR300: