summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro2007-05-15 09:21:17 +0200
committerJeff Garzik2007-05-16 07:18:30 +0200
commitd1c68fa6ce7e56e300d8561bb3b6492c336df863 (patch)
treef0ca29ef45ad5f68164ee3210eb529ad8452be02
parentarm: walk_stacktrace() needs to be exported (diff)
downloadkernel-qcow2-linux-d1c68fa6ce7e56e300d8561bb3b6492c336df863.tar.gz
kernel-qcow2-linux-d1c68fa6ce7e56e300d8561bb3b6492c336df863.tar.xz
kernel-qcow2-linux-d1c68fa6ce7e56e300d8561bb3b6492c336df863.zip
pata_scc had been missed by ata_std_prereset() switch
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/ata/pata_scc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index cca3aa225efe..844e53b280c7 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -864,10 +864,10 @@ static void scc_bmdma_freeze (struct ata_port *ap)
* @ap: ATA port to be reset
*/
-static int scc_pata_prereset (struct ata_port *ap)
+static int scc_pata_prereset (struct ata_port *ap, unsigned long deadline)
{
ap->cbl = ATA_CBL_PATA80;
- return ata_std_prereset(ap);
+ return ata_std_prereset(ap, deadline);
}
/**