From 19f45bc621336a864013ef2cff582e7ad8348a2c Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 6 Jul 2009 18:04:28 +0100 Subject: [PATCH] --- yaml --- r: 155562 b: refs/heads/master c: 6860107a46c8762d35eb7bf71bcf6c6510793b76 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-u300/core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e5ea9e1e33fe..6f6b976a02d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0b98ec87d7a293a7d9ab8e45935c53a68f3094a +refs/heads/master: 6860107a46c8762d35eb7bf71bcf6c6510793b76 diff --git a/trunk/arch/arm/mach-u300/core.c b/trunk/arch/arm/mach-u300/core.c index 89b3ccf35e1b..7936085dd758 100644 --- a/trunk/arch/arm/mach-u300/core.c +++ b/trunk/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], 0); - vic_init((void __iomem *) U300_INTCON1_VBASE, 32, mask[1], 0); + vic_init((void __iomem *) U300_INTCON0_VBASE, 0, mask[0], mask[0]); + vic_init((void __iomem *) U300_INTCON1_VBASE, 32, mask[1], mask[1]); }