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_vp3030.c

diff --git a/drivers/media/dvb/mantis/mantis_vp3030.c b/drivers/media/dvb/mantis/mantis_vp3030.c
index 1f4334214953f4c43caa5d896340005f39278dad..c09308cd3ac677e0d53ace29e525039e3482dc04 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_vp3030.c
+++ b/drivers/media/dvb/mantis/mantis_vp3030.c
@@ -59,21 +59,21 @@ static int vp3030_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *
        struct mantis_hwconfig *config  = mantis->hwconfig;
        int err = 0;
 
-       gpio_set_bits(mantis, config->reset, 0);
+       mantis_gpio_set_bits(mantis, config->reset, 0);
        msleep(100);
        err = mantis_frontend_power(mantis, POWER_ON);
        msleep(100);
-       gpio_set_bits(mantis, config->reset, 1);
+       mantis_gpio_set_bits(mantis, config->reset, 1);
 
        if (err == 0) {
                msleep(250);
                dprintk(MANTIS_ERROR, 1, "Probing for 10353 (DVB-T)");
-               fe = zl10353_attach(&mantis_vp3030_config, adapter);
+               fe = dvb_attach(zl10353_attach, &mantis_vp3030_config, adapter);
 
                if (!fe)
                        return -1;
 
-               tda665x_attach(fe, &env57h12d5_config, adapter);
+               dvb_attach(tda665x_attach, fe, &env57h12d5_config, adapter);
        } else {
                dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed! <%d>",
                        adapter->name,