From 416de786f97cd1f799bfe11651b2f5471bf247de Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Sat, 19 Sep 2009 13:13:14 -0700 Subject: [PATCH] --- yaml --- r: 163812 b: refs/heads/master c: f6e208c1119206e2382ef7df6e47aaee18eb7f10 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/cyclades.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e272c50a79d..ed67059e81e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebdb513596c0eb1dcb3bad8f53865964a2207ca9 +refs/heads/master: f6e208c1119206e2382ef7df6e47aaee18eb7f10 diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c index 3884ea439935..b6d40ad662ff 100644 --- a/trunk/drivers/char/cyclades.c +++ b/trunk/drivers/char/cyclades.c @@ -389,7 +389,7 @@ static unsigned detect_isa_irq(void __iomem *address) irqs = probe_irq_on(); /* Wait ... */ - udelay(5000L); + msleep(5); /* Enable the Tx interrupts on the CD1400 */ local_irq_save(flags); @@ -402,7 +402,7 @@ static unsigned detect_isa_irq(void __iomem *address) local_irq_restore(flags); /* Wait ... */ - udelay(5000L); + msleep(5); /* Check which interrupt is in use */ irq = probe_irq_off(irqs);