diff options
Diffstat (limited to 'drivers/ata/pata_pcmcia.c')
-rw-r--r-- | drivers/ata/pata_pcmcia.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 57efbf05c95f..2e206c5f869a 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
@@ -133,7 +133,7 @@ static struct scsi_host_template pcmcia_sht = { | |||
133 | 133 | ||
134 | static struct ata_port_operations pcmcia_port_ops = { | 134 | static struct ata_port_operations pcmcia_port_ops = { |
135 | .inherits = &ata_sff_port_ops, | 135 | .inherits = &ata_sff_port_ops, |
136 | .data_xfer = ata_data_xfer_noirq, | 136 | .data_xfer = ata_sff_data_xfer_noirq, |
137 | .cable_detect = ata_cable_40wire, | 137 | .cable_detect = ata_cable_40wire, |
138 | .set_mode = pcmcia_set_mode, | 138 | .set_mode = pcmcia_set_mode, |
139 | }; | 139 | }; |
@@ -323,13 +323,13 @@ next_entry: | |||
323 | ap->ioaddr.cmd_addr = io_addr + 0x10 * p; | 323 | ap->ioaddr.cmd_addr = io_addr + 0x10 * p; |
324 | ap->ioaddr.altstatus_addr = ctl_addr + 0x10 * p; | 324 | ap->ioaddr.altstatus_addr = ctl_addr + 0x10 * p; |
325 | ap->ioaddr.ctl_addr = ctl_addr + 0x10 * p; | 325 | ap->ioaddr.ctl_addr = ctl_addr + 0x10 * p; |
326 | ata_std_ports(&ap->ioaddr); | 326 | ata_sff_std_ports(&ap->ioaddr); |
327 | 327 | ||
328 | ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", io_base, ctl_base); | 328 | ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", io_base, ctl_base); |
329 | } | 329 | } |
330 | 330 | ||
331 | /* activate */ | 331 | /* activate */ |
332 | ret = ata_host_activate(host, pdev->irq.AssignedIRQ, ata_interrupt, | 332 | ret = ata_host_activate(host, pdev->irq.AssignedIRQ, ata_sff_interrupt, |
333 | IRQF_SHARED, &pcmcia_sht); | 333 | IRQF_SHARED, &pcmcia_sht); |
334 | if (ret) | 334 | if (ret) |
335 | goto failed; | 335 | goto failed; |