summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/irq.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kernel/irq.c')
-rw-r--r--arch/arm/kernel/irq.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index b4950ace2..332e8940d 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -119,7 +119,9 @@ int get_irq_list(char *buf)
*p++ = '\n';
}
+#ifdef CONFIG_ACORN
p += get_fiq_list(p);
+#endif
return p - buf;
}
@@ -354,7 +356,7 @@ unsigned long probe_irq_on(void)
/*
* wait for spurious interrupts to mask themselves out again
*/
- for (delay = jiffies + HZ/10; delay > jiffies; )
+ for (delay = jiffies + HZ/10; time_before(jiffies, delay); )
/* min 100ms delay */;
/*
@@ -424,6 +426,8 @@ __initfunc(void init_IRQ(void))
}
irq_init_irq();
+#ifdef CONFIG_ARCH_ACORN
init_FIQ();
+#endif
init_dma();
}