Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / dvb / mantis / mantis_vp2033.c

diff --git a/drivers/media/dvb/mantis/mantis_vp2033.c b/drivers/media/dvb/mantis/mantis_vp2033.c
index 10ce81790a8c2bc96afed737287e4e493153d27a..06da0ddf05a77b46bcb582a274019499a6cb5f67 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_vp2033.c
+++ b/drivers/media/dvb/mantis/mantis_vp2033.c
@@ -132,7 +132,7 @@ static int vp2033_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *
                msleep(250);
 
                dprintk(MANTIS_ERROR, 1, "Probing for CU1216 (DVB-C)");
-               fe = tda10021_attach(&vp2033_tda1002x_cu1216_config,
+               fe = dvb_attach(tda10021_attach, &vp2033_tda1002x_cu1216_config,
                                     adapter,
                                     read_pwm(mantis));
 
@@ -141,7 +141,7 @@ static int vp2033_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *
                                "found Philips CU1216 DVB-C frontend (TDA10021) @ 0x%02x",
                                vp2033_tda1002x_cu1216_config.demod_address);
                } else {
-                       fe = tda10023_attach(&vp2033_tda10023_cu1216_config,
+                       fe = dvb_attach(tda10023_attach, &vp2033_tda10023_cu1216_config,
                                             adapter,
                                             read_pwm(mantis));