Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

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

diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index a907cf4788910a2b5ac32b8a4ae8772dee898b19..2de30b990278b9fb6705dcc440166e2f936ce3ef 100644 (file)
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -172,7 +172,7 @@ static struct scsi_host_template cmd640_sht = {
 static struct ata_port_operations cmd640_port_ops = {
        .inherits       = &ata_bmdma_port_ops,
        /* In theory xfer_noirq is not needed once we kill the prefetcher */
-       .data_xfer      = ata_sff_data_xfer_noirq,
+       .sff_data_xfer  = ata_sff_data_xfer_noirq,
        .qc_issue       = cmd640_qc_issue,
        .cable_detect   = ata_cable_40wire,
        .set_piomode    = cmd640_set_piomode,