On Wed, Jan 26, 2011 at 10:12:16AM -0800, Tony Lindgren wrote: > * Russell King - ARM Linux <[email protected]> [110126 00:57]: > > On Fri, Jan 07, 2011 at 08:56:26AM -0800, Tony Lindgren wrote: > > > > diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c > > > > index e66687b..c203204 100644 > > > > --- a/arch/arm/mach-omap2/io.c > > > > +++ b/arch/arm/mach-omap2/io.c > > > > @@ -314,14 +314,13 @@ static int _set_hwmod_postsetup_state(struct > > > > omap_hwmod *oh, void *data) > > > > return omap_hwmod_set_postsetup_state(oh, *(u8 *)data); > > > > } > > > > > > > > +void __iomem *omap_irq_base; > > > > + > > > > /* > > > > * Initialize asm_irq_base for entry-macro.S > > > > */ > > > > static inline void omap_irq_base_init(void) > > > > { > > > > - extern void __iomem *omap_irq_base; > > > > - > > > > -#ifdef MULTI_OMAP2 > > > > if (cpu_is_omap24xx()) > > > > omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE); > > > > else if (cpu_is_omap34xx()) > > > > @@ -330,7 +329,6 @@ static inline void omap_irq_base_init(void) > > > > omap_irq_base = > > > > OMAP2_L4_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE); > > > > else > > > > pr_err("Could not initialize omap_irq_base\n"); > > > > -#endif > > > > } > > > > > > > > void __init omap2_init_common_infrastructure(void) > > > > > > This looks good to me. > > > > I notice this one is still there. > > Sorry I thought you'll queue this one. > > BTW this fixes regression from patch 5d190c40100793a6dfc37bf325677c10f3c80edf > (omap2+: Initialize omap_irq_base for entry-macro.S from platform code). > So it should be OK for the -rc cycle: > > Acked-by: Tony Lindgren <[email protected]> > > Let me know if you want me to take it, in that case I think it's still > missing your Signed-off-by.
Signed-off-by: Russell King <[email protected]> > Let me know if you want me to queue it. Yes please. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
