Merge branch 'master' of git://git.infradead.org/~dedekind/ubi-2.6

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

diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 508d1cab52d12d1a7258de6138e50c0314e5493a..0713872cf65c64c936c14a15aacda6c7f851f640 100644 (file)
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -312,7 +312,6 @@ static struct scsi_host_template hpt36x_sht = {
  */
 
 static struct ata_port_operations hpt366_port_ops = {
-       .port_disable   = ata_port_disable,
        .set_piomode    = hpt366_set_piomode,
        .set_dmamode    = hpt366_set_dmamode,
        .mode_filter    = hpt366_filter,
@@ -343,7 +342,7 @@ static struct ata_port_operations hpt366_port_ops = {
        .irq_clear      = ata_bmdma_irq_clear,
        .irq_on         = ata_irq_on,
 
-       .port_start     = ata_port_start,
+       .port_start     = ata_sff_port_start,
 };
 
 /**