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

diff --git a/drivers/media/dvb/mantis/mantis_vp1034.c b/drivers/media/dvb/mantis/mantis_vp1034.c
index 8e6ae558ee57424b40f5622ce44ea86ca2c1a737..26bc0cbe84d45596b5ffacface72e0669367b98d 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_vp1034.c
+++ b/drivers/media/dvb/mantis/mantis_vp1034.c
@@ -50,13 +50,13 @@ int vp1034_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
        switch (voltage) {
        case SEC_VOLTAGE_13:
                dprintk(MANTIS_ERROR, 1, "Polarization=[13V]");
-               gpio_set_bits(mantis, 13, 1);
-               gpio_set_bits(mantis, 14, 0);
+               mantis_gpio_set_bits(mantis, 13, 1);
+               mantis_gpio_set_bits(mantis, 14, 0);
                break;
        case SEC_VOLTAGE_18:
                dprintk(MANTIS_ERROR, 1, "Polarization=[18V]");
-               gpio_set_bits(mantis, 13, 1);
-               gpio_set_bits(mantis, 14, 1);
+               mantis_gpio_set_bits(mantis, 13, 1);
+               mantis_gpio_set_bits(mantis, 14, 1);
                break;
        case SEC_VOLTAGE_OFF:
                dprintk(MANTIS_ERROR, 1, "Frontend (dummy) POWERDOWN");
@@ -82,7 +82,7 @@ static int vp1034_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *
                msleep(250);
 
                dprintk(MANTIS_ERROR, 1, "Probing for MB86A16 (DVB-S/DSS)");
-               fe = mb86a16_attach(&vp1034_mb86a16_config, adapter);
+               fe = dvb_attach(mb86a16_attach, &vp1034_mb86a16_config, adapter);
                if (fe) {
                        dprintk(MANTIS_ERROR, 1,
                        "found MB86A16 DVB-S/DSS frontend @0x%02x",