diff options
Diffstat (limited to 'drivers/ata/pata_marvell.c')
-rw-r--r-- | drivers/ata/pata_marvell.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index d9b94a1b6954..8ab236c54823 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c | |||
@@ -25,11 +25,12 @@ | |||
25 | /** | 25 | /** |
26 | * marvell_pre_reset - check for 40/80 pin | 26 | * marvell_pre_reset - check for 40/80 pin |
27 | * @ap: Port | 27 | * @ap: Port |
28 | * @deadline: deadline jiffies for the operation | ||
28 | * | 29 | * |
29 | * Perform the PATA port setup we need. | 30 | * Perform the PATA port setup we need. |
30 | */ | 31 | */ |
31 | 32 | ||
32 | static int marvell_pre_reset(struct ata_port *ap) | 33 | static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline) |
33 | { | 34 | { |
34 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 35 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
35 | u32 devices; | 36 | u32 devices; |
@@ -67,6 +68,7 @@ static int marvell_cable_detect(struct ata_port *ap) | |||
67 | case 1: /* Legacy SATA port */ | 68 | case 1: /* Legacy SATA port */ |
68 | return ATA_CBL_SATA; | 69 | return ATA_CBL_SATA; |
69 | } | 70 | } |
71 | |||
70 | BUG(); | 72 | BUG(); |
71 | return 0; /* Our BUG macro needs the right markup */ | 73 | return 0; /* Our BUG macro needs the right markup */ |
72 | } | 74 | } |