Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / irq.c

diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 5e95c5372fecde471b8767f2cc94d7a815377a7e..fa69c3a6a38e2f558ca2176fc271f5c031ad413f 100644 (file)
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -57,7 +57,7 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
 
        pxa_internal_irq_nr = irq_nr;
 
-       for (irq = 0; irq < irq_nr; irq += 32) {
+       for (irq = PXA_IRQ(0); irq < PXA_IRQ(irq_nr); irq += 32) {
                _ICMR(irq) = 0; /* disable all IRQs */
                _ICLR(irq) = 0; /* all IRQs are IRQ, not FIQ */
        }