Merge branch 'locks' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / drivers / ata / pata_radisys.c

diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 7d1aabed422db6bd11c45c6f951171bed7a2c564..d5b76497f4a24ad891776e5d0a1b71d221954f05 100644 (file)
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -203,7 +203,6 @@ static struct scsi_host_template radisys_sht = {
 };
 
 static const struct ata_port_operations radisys_pata_ops = {
-       .port_disable           = ata_port_disable,
        .set_piomode            = radisys_set_piomode,
        .set_dmamode            = radisys_set_dmamode,
        .mode_filter            = ata_pci_default_filter,
@@ -231,9 +230,8 @@ static const struct ata_port_operations radisys_pata_ops = {
        .irq_handler            = ata_interrupt,
        .irq_clear              = ata_bmdma_irq_clear,
        .irq_on                 = ata_irq_on,
-       .irq_ack                = ata_irq_ack,
 
-       .port_start             = ata_port_start,
+       .port_start             = ata_sff_port_start,
 };