diff options
Diffstat (limited to 'arch/arm/mach-omap2/omap4-common.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap4-common.c | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index e7a9b7f13b5..19268647ce3 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -26,21 +26,22 @@  void __iomem *l2cache_base;  #endif -void __iomem *gic_cpu_base_addr;  void __iomem *gic_dist_base_addr;  void __init gic_init_irq(void)  { +	void __iomem *gic_cpu_base; +  	/* Static mapping, never released */  	gic_dist_base_addr = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K);  	BUG_ON(!gic_dist_base_addr); -	gic_dist_init(0, gic_dist_base_addr, 29);  	/* Static mapping, never released */ -	gic_cpu_base_addr = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_512); -	BUG_ON(!gic_cpu_base_addr); -	gic_cpu_init(0, gic_cpu_base_addr); +	gic_cpu_base = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_512); +	BUG_ON(!gic_cpu_base); + +	gic_init(0, 29, gic_dist_base_addr, gic_cpu_base);  }  #ifdef CONFIG_CACHE_L2X0  |