summaryrefslogtreecommitdiffstats
path: root/drivers/ap1000
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-02-15 02:15:32 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-02-15 02:15:32 +0000
commit86464aed71025541805e7b1515541aee89879e33 (patch)
treee01a457a4912a8553bc65524aa3125d51f29f810 /drivers/ap1000
parent88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff)
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/ap1000')
-rw-r--r--drivers/ap1000/ddv_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ap1000/ddv_util.c b/drivers/ap1000/ddv_util.c
index b853a3216..d6cf12216 100644
--- a/drivers/ap1000/ddv_util.c
+++ b/drivers/ap1000/ddv_util.c
@@ -92,7 +92,7 @@ int ddv_restart_cpu(void)
return(-1);
}
for (timeout=jiffies + 10;
- (jiffies < timeout) || (OPT_IO(PBUF0) == 0);
+ time_before(jiffies, timeout) || (OPT_IO(PBUF0) == 0);
) /* wait */ ;
if (OPT_IO(PBUF0) == 0) {
printk("WARNING: option kernel didn't startup\n");