diff options
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
| -rw-r--r-- | arch/arm/mach-omap2/control.c | 14 | 
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index aab884fecc5..e34d27f8c49 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c @@ -149,17 +149,11 @@ static struct omap3_control_regs control_context;  void __init omap2_set_globals_control(struct omap_globals *omap2_globals)  { -	/* Static mapping, never released */ -	if (omap2_globals->ctrl) { -		omap2_ctrl_base = ioremap(omap2_globals->ctrl, SZ_4K); -		WARN_ON(!omap2_ctrl_base); -	} +	if (omap2_globals->ctrl) +		omap2_ctrl_base = omap2_globals->ctrl; -	/* Static mapping, never released */ -	if (omap2_globals->ctrl_pad) { -		omap4_ctrl_pad_base = ioremap(omap2_globals->ctrl_pad, SZ_4K); -		WARN_ON(!omap4_ctrl_pad_base); -	} +	if (omap2_globals->ctrl_pad) +		omap4_ctrl_pad_base = omap2_globals->ctrl_pad;  }  void __iomem *omap_ctrl_base_get(void)  |