Merge branch 'u300' into devel

[sfrench/cifs-2.6.git] / arch / arm / mach-u300 / core.c

diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 1f2ed21a0ab1461a5c9cb33eae8519f9c57012b0..89b3ccf35e1bbf74740c2c856f03ad908b694fe9 100644 (file)
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -455,8 +455,8 @@ void __init u300_init_irq(void)
        for (i = 0; i < NR_IRQS; i++)
                set_bit(i, (unsigned long *) &mask[0]);
        u300_enable_intcon_clock();
-       vic_init((void __iomem *) U300_INTCON0_VBASE, 0, mask[0]);
-       vic_init((void __iomem *) U300_INTCON1_VBASE, 32, mask[1]);
+       vic_init((void __iomem *) U300_INTCON0_VBASE, 0, mask[0], 0);
+       vic_init((void __iomem *) U300_INTCON1_VBASE, 32, mask[1], 0);
 }