V4L/DVB (7861): mt312: Prefix functions only with mt312_, Add zl10313 to kconfig...

[linux-2.6] / drivers / ata / pata_pcmcia.c

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 57efbf05c95fe2644d224188f2f8bc35c9102b00..3d39f9dfec5ae9cf8d7aaa1be3a0d935bb9cd2a5 100644 (file)
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -133,14 +133,14 @@ static struct scsi_host_template pcmcia_sht = {
 
 static struct ata_port_operations pcmcia_port_ops = {
        .inherits       = &ata_sff_port_ops,
-       .data_xfer      = ata_data_xfer_noirq,
+       .sff_data_xfer  = ata_sff_data_xfer_noirq,
        .cable_detect   = ata_cable_40wire,
        .set_mode       = pcmcia_set_mode,
 };
 
 static struct ata_port_operations pcmcia_8bit_port_ops = {
        .inherits       = &ata_sff_port_ops,
-       .data_xfer      = ata_data_xfer_8bit,
+       .sff_data_xfer  = ata_data_xfer_8bit,
        .cable_detect   = ata_cable_40wire,
        .set_mode       = pcmcia_set_mode_8bit,
 };
@@ -323,13 +323,13 @@ next_entry:
                ap->ioaddr.cmd_addr = io_addr + 0x10 * p;
                ap->ioaddr.altstatus_addr = ctl_addr + 0x10 * p;
                ap->ioaddr.ctl_addr = ctl_addr + 0x10 * p;
-               ata_std_ports(&ap->ioaddr);
+               ata_sff_std_ports(&ap->ioaddr);
 
                ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", io_base, ctl_base);
        }
 
        /* activate */
-       ret = ata_host_activate(host, pdev->irq.AssignedIRQ, ata_interrupt,
+       ret = ata_host_activate(host, pdev->irq.AssignedIRQ, ata_sff_interrupt,
                                IRQF_SHARED, &pcmcia_sht);
        if (ret)
                goto failed;