diff options
Diffstat (limited to 'arch/arm/mach-u300')
| -rw-r--r-- | arch/arm/mach-u300/core.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-u300/timer.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 1f2ed21a0ab..89b3ccf35e1 100644 --- 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); } diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c index 57b5351b181..cce53204880 100644 --- a/arch/arm/mach-u300/timer.c +++ b/arch/arm/mach-u300/timer.c @@ -331,7 +331,7 @@ static struct irqaction u300_timer_irq = { }; /* Use general purpose timer 2 as clock source */ -static cycle_t u300_get_cycles(void) +static cycle_t u300_get_cycles(struct clocksource *cs) { return (cycles_t) readl(U300_TIMER_APP_VBASE + U300_TIMER_APP_GPT2CC); } |