Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

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

diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index 851dae960018cae9bc44b1c88b437f751f1cd214..44da09ace52c53e98280f18f39659663ad87fe3a 100644 (file)
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -200,7 +200,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
  *
  *     Called when the libata layer is about to issue a command. We wrap
  *     this interface so that we can load the correct ATA timings if
- *     neccessary. Our logic also clears TIME0/TIME1 for the other device so
+ *     necessary. Our logic also clears TIME0/TIME1 for the other device so
  *     that, even if we get this wrong, cycles to the other device will
  *     be made PIO0.
  */
@@ -238,7 +238,6 @@ static struct scsi_host_template oldpiix_sht = {
 };
 
 static const struct ata_port_operations oldpiix_pata_ops = {
-       .port_disable           = ata_port_disable,
        .set_piomode            = oldpiix_set_piomode,
        .set_dmamode            = oldpiix_set_dmamode,
        .mode_filter            = ata_pci_default_filter,
@@ -267,7 +266,7 @@ static const struct ata_port_operations oldpiix_pata_ops = {
        .irq_clear              = ata_bmdma_irq_clear,
        .irq_on                 = ata_irq_on,
 
-       .port_start             = ata_port_start,
+       .port_start             = ata_sff_port_start,
 };