From 27c78b372d05e47bbd059c9bb003c6d716abff54 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 9 Mar 2007 09:41:19 -0500 Subject: [libata reset-seq] build and merge fixes Signed-off-by: Jeff Garzik --- drivers/ata/pata_marvell.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/ata/pata_marvell.c') diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index 8ab236c54823..837b7fe77dc7 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c @@ -53,7 +53,8 @@ static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline) if ((pdev->device == 0x6145) && (ap->port_no == 0) && (!(devices & 0x10))) /* PATA enable ? */ return -ENOENT; - return ata_std_prereset(ap); + + return ata_std_prereset(ap, deadline); } static int marvell_cable_detect(struct ata_port *ap) -- cgit v1.2.1