OMAP2/3 clock: mark the rest of the CM clocks as belonging to cm_clkdm

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / mmu.h

diff --git a/arch/arm/mach-omap2/mmu.h b/arch/arm/mach-omap2/mmu.h
index bae9db79a7dab4eef963490a05b91578fd46b69f..c9eabf0993fde5a6d1ae32c835b6c1b3f6b4606c 100644 (file)
--- a/arch/arm/mach-omap2/mmu.h
+++ b/arch/arm/mach-omap2/mmu.h
@@ -1,8 +1,8 @@
 #ifndef __MACH_OMAP2_MMU_H
 #define __MACH_OMAP2_MMU_H
 
-#include <asm/arch/mmu.h>
-#include <asm/io.h>
+#include <linux/io.h>
+#include <mach/mmu.h>
 
 #define MMU_LOCK_BASE_MASK             (0x1f << 10)
 #define MMU_LOCK_VICTIM_MASK           (0x1f << 4)
@@ -105,13 +105,13 @@ struct omap_mmu_tlb_entry {
 static inline unsigned long
 omap_mmu_read_reg(struct omap_mmu *mmu, unsigned long reg)
 {
-       return __raw_readl(mmu->base + reg);
+       return __raw_readl((void __iomem *)(mmu->base + reg));
 }
 
 static inline void omap_mmu_write_reg(struct omap_mmu *mmu,
                               unsigned long val, unsigned long reg)
 {
-       __raw_writel(val, mmu->base + reg);
+       __raw_writel(val, (void __iomem *)(mmu->base + reg));
 }
 
 #endif /* __MACH_OMAP2_MMU_H */