[SCSI] add residual argument to scsi_execute and scsi_execute_req

[safe/jmp/linux-2.6] / drivers / ata / pata_isapnp.c

diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 085913e..15cdb91 100644 (file)
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -1,7 +1,7 @@
 
 /*
  *   pata-isapnp.c - ISA PnP PATA controller driver.
- *   Copyright 2005/2006 Red Hat Inc <alan@redhat.com>, all rights reserved.
+ *   Copyright 2005/2006 Red Hat Inc, all rights reserved.
  *
  *   Based in part on ide-pnp.c by Andrey Panin <pazke@donpac.ru>
  */
@@ -50,7 +50,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
 
        if (pnp_irq_valid(idev, 0)) {
                irq = pnp_irq(idev, 0);
-               handler = ata_interrupt;
+               handler = ata_sff_interrupt;
        }
 
        /* allocate host */
@@ -78,7 +78,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
                ap->ioaddr.ctl_addr = ctl_addr;
        }
 
-       ata_std_ports(&ap->ioaddr);
+       ata_sff_std_ports(&ap->ioaddr);
 
        ata_port_desc(ap, "cmd 0x%llx ctl 0x%llx",
                      (unsigned long long)pnp_port_start(idev, 0),