Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...

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

diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index 2e40a5c..597e2da 100644 (file)
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -23,6 +23,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 
 #include <mach/system.h>
 #include <plat/common.h>
@@ -151,17 +152,10 @@ int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest,
 
 void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals)
 {
-       /* Static mapping, never released */
-       if (omap2_globals->prm) {
-               prm_base = ioremap(omap2_globals->prm, SZ_8K);
-               WARN_ON(!prm_base);
-       }
-       if (omap2_globals->cm) {
-               cm_base = ioremap(omap2_globals->cm, SZ_8K);
-               WARN_ON(!cm_base);
-       }
-       if (omap2_globals->cm2) {
-               cm2_base = ioremap(omap2_globals->cm2, SZ_8K);
-               WARN_ON(!cm2_base);
-       }
+       if (omap2_globals->prm)
+               prm_base = omap2_globals->prm;
+       if (omap2_globals->cm)
+               cm_base = omap2_globals->cm;
+       if (omap2_globals->cm2)
+               cm2_base = omap2_globals->cm2;
 }