X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fata%2Fsata_sis.c;h=6b8e45ba32e8e89e91ef67966e8a8593842340c6;hb=48feb3c419508487becfb9ea3afcc54c3eac6d80;hp=9089c7ab5000c269093f6fec19cffb4e20ac5f55;hpb=029cfd6b74fc5c517865fad78cf4a3ea8d9b664a;p=linux-2.6

diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 9089c7ab50..6b8e45ba32 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -309,7 +309,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		break;
 	}
 
-	rc = ata_pci_prepare_sff_host(pdev, ppi, &host);
+	rc = ata_pci_sff_prepare_host(pdev, ppi, &host);
 	if (rc)
 		return rc;
 
@@ -327,8 +327,8 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	pci_set_master(pdev);
 	pci_intx(pdev, 1);
-	return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED,
-				 &sis_sht);
+	return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
+				 IRQF_SHARED, &sis_sht);
 }
 
 static int __init sis_init(void)