Misc fixes to sync with mainline

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / control.h

diff --git a/arch/arm/plat-omap/include/mach/control.h b/arch/arm/plat-omap/include/mach/control.h
index e15d6e988185df252e0b302048a4109419de6ffe..1cd98fd9801a0804b33dead11ee943b34ef4f3b2 100644 (file)
--- a/arch/arm/plat-omap/include/mach/control.h
+++ b/arch/arm/plat-omap/include/mach/control.h
@@ -20,11 +20,11 @@
 
 #ifndef __ASSEMBLY__
 #define OMAP242X_CTRL_REGADDR(reg)                                     \
-       (__force void __iomem *)IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
+       (void __iomem *)IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
 #define OMAP243X_CTRL_REGADDR(reg)                                     \
-       (__force void __iomem *)IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
+       (void __iomem *)IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
 #define OMAP343X_CTRL_REGADDR(reg)                                     \
-       (__force void __iomem *)IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
+       (void __iomem *)IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
 #else
 #define OMAP242X_CTRL_REGADDR(reg)     IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
 #define OMAP243X_CTRL_REGADDR(reg)     IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))