Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[pandora-kernel.git] / arch / arm / mach-omap2 / control.c

diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index cdd1f35..43f8a33 100644 (file)
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -140,7 +140,11 @@ static struct omap3_control_regs control_context;
 
 void __init omap2_set_globals_control(struct omap_globals *omap2_globals)
 {
-       omap2_ctrl_base = omap2_globals->ctrl;
+       /* Static mapping, never released */
+       if (omap2_globals->ctrl) {
+               omap2_ctrl_base = ioremap(omap2_globals->ctrl, SZ_4K);
+               WARN_ON(!omap2_ctrl_base);
+       }
 }
 
 void __iomem *omap_ctrl_base_get(void)