commit 27c78b372d05e47bbd059c9bb003c6d716abff54
author Jeff Garzik <jeff@garzik.org> Fri Mar 09 09:41:19 2007 -0500
committer Jeff Garzik <jeff@garzik.org> Tue May 01 07:49:54 2007 -0400
tree 3d6880b48557689dbe67c88cca952636a4554c5b
parent 31daabda16063b64a99a526242add727601e43c3

[libata reset-seq] build and merge fixes

Signed-off-by: Jeff Garzik <jeff@garzik.org>

drivers/ata/pata_marvell.c

diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 8ab236c..837b7fe 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -53,7 +53,8 @@
 	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)