Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[cascardo/linux.git] / drivers / ata / pata_artop.c

diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 8c86435..d421831 100644 (file)
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -332,7 +332,6 @@ static struct scsi_host_template artop_sht = {
 };
 
 static const struct ata_port_operations artop6210_ops = {
-       .port_disable           = ata_port_disable,
        .set_piomode            = artop6210_set_piomode,
        .set_dmamode            = artop6210_set_dmamode,
        .mode_filter            = ata_pci_default_filter,
@@ -362,11 +361,10 @@ static const struct ata_port_operations artop6210_ops = {
        .irq_clear              = ata_bmdma_irq_clear,
        .irq_on                 = ata_irq_on,
 
-       .port_start             = ata_port_start,
+       .port_start             = ata_sff_port_start,
 };
 
 static const struct ata_port_operations artop6260_ops = {
-       .port_disable           = ata_port_disable,
        .set_piomode            = artop6260_set_piomode,
        .set_dmamode            = artop6260_set_dmamode,
 
@@ -394,7 +392,7 @@ static const struct ata_port_operations artop6260_ops = {
        .irq_clear              = ata_bmdma_irq_clear,
        .irq_on                 = ata_irq_on,
 
-       .port_start             = ata_port_start,
+       .port_start             = ata_sff_port_start,
 };