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 / hopper_vp3028.c

diff --git a/drivers/media/dvb/mantis/hopper_vp3028.c b/drivers/media/dvb/mantis/hopper_vp3028.c
index 96674c78e86be22a588839e0411e890b93b6c70e..68a29f8bdf732b1e7bad70cba5afb5f365c86e6e 100644 (file)
--- a/drivers/media/dvb/mantis/hopper_vp3028.c
+++ b/drivers/media/dvb/mantis/hopper_vp3028.c
@@ -47,17 +47,17 @@ static int vp3028_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);
 
        err = mantis_frontend_power(mantis, POWER_ON);
        if (err == 0) {
                msleep(250);
                dprintk(MANTIS_ERROR, 1, "Probing for 10353 (DVB-T)");
-               fe = zl10353_attach(&hopper_vp3028_config, adapter);
+               fe = dvb_attach(zl10353_attach, &hopper_vp3028_config, adapter);
 
                if (!fe)
                        return -1;