aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_marvell.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_marvell.c')
-rw-r--r--drivers/ata/pata_marvell.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index d38e64cd609..24a011b2502 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -55,7 +55,7 @@ static int marvell_pre_reset(struct ata_link *link, unsigned long deadline)
55 (!(devices & 0x10))) /* PATA enable ? */ 55 (!(devices & 0x10))) /* PATA enable ? */
56 return -ENOENT; 56 return -ENOENT;
57 57
58 return ata_std_prereset(link, deadline); 58 return ata_sff_prereset(link, deadline);
59} 59}
60 60
61static int marvell_cable_detect(struct ata_port *ap) 61static int marvell_cable_detect(struct ata_port *ap)
@@ -128,7 +128,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
128 if (pdev->device == 0x6101) 128 if (pdev->device == 0x6101)
129 ppi[1] = &ata_dummy_port_info; 129 ppi[1] = &ata_dummy_port_info;
130 130
131 return ata_pci_init_one(pdev, ppi, &marvell_sht, NULL); 131 return ata_pci_sff_init_one(pdev, ppi, &marvell_sht, NULL);
132} 132}
133 133
134static const struct pci_device_id marvell_pci_tbl[] = { 134static const struct pci_device_id marvell_pci_tbl[] = {