Merge branch 'for-linus' of git://www.jni.nu/cris

[linux-2.6] / arch / arm / mach-omap2 / sdrc.h

diff --git a/arch/arm/mach-omap2/sdrc.h b/arch/arm/mach-omap2/sdrc.h
index d7f23bc9550a8a2266008f491b8824fffb39209f..1b1fe4f6e030c15df54db2126340f7a945f23e4e 100644 (file)
--- a/arch/arm/mach-omap2/sdrc.h
+++ b/arch/arm/mach-omap2/sdrc.h
@@ -18,13 +18,11 @@
 #include <asm/arch/sdrc.h>
 
 #ifndef __ASSEMBLER__
-extern unsigned long omap2_sdrc_base;
-extern unsigned long omap2_sms_base;
+extern void __iomem *omap2_sdrc_base;
+extern void __iomem *omap2_sms_base;
 
-#define OMAP_SDRC_REGADDR(reg)                                         \
-               (void __iomem *)IO_ADDRESS(omap2_sdrc_base + (reg))
-#define OMAP_SMS_REGADDR(reg)                                          \
-               (void __iomem *)IO_ADDRESS(omap2_sms_base + (reg))
+#define OMAP_SDRC_REGADDR(reg)                 (omap2_sdrc_base + (reg))
+#define OMAP_SMS_REGADDR(reg)                  (omap2_sms_base + (reg))
 
 /* SDRC global register get/set */