Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 2 deletions

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