Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

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

diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index 2d64c58482fa92bfe29f6f15ec99331d95203c03..25c922abd5540e820ab5a6f879ea982306767c01 100644 (file)
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -40,8 +40,6 @@ static struct scsi_host_template netcell_sht = {
 };
 
 static const struct ata_port_operations netcell_ops = {
-       .port_disable           = ata_port_disable,
-
        /* Task file is PCI ATA format, use helpers */
        .tf_load                = ata_tf_load,
        .tf_read                = ata_tf_read,
@@ -70,7 +68,7 @@ static const struct ata_port_operations netcell_ops = {
        .irq_on                 = ata_irq_on,
 
        /* Generic PATA PCI ATA helpers */
-       .port_start             = ata_port_start,
+       .port_start             = ata_sff_port_start,
 };