Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / arch / arm / mach-ep93xx / include / mach / io.h

diff --git a/arch/arm/mach-ep93xx/include/mach/io.h b/arch/arm/mach-ep93xx/include/mach/io.h
index fd5f081..cebcc1c 100644 (file)
--- a/arch/arm/mach-ep93xx/include/mach/io.h
+++ b/arch/arm/mach-ep93xx/include/mach/io.h
@@ -1,8 +1,21 @@
 /*
  * arch/arm/mach-ep93xx/include/mach/io.h
  */
+#ifndef __ASM_MACH_IO_H
+#define __ASM_MACH_IO_H
 
 #define IO_SPACE_LIMIT         0xffffffff
 
-#define __io(p)                __typesafe_io(p)
-#define __mem_pci(p)   (p)
+#define __io(p)                        __typesafe_io(p)
+#define __mem_pci(p)           (p)
+
+/*
+ * A typesafe __io() variation for variable initialisers
+ */
+#ifdef __ASSEMBLER__
+#define IOMEM(p)               p
+#else
+#define IOMEM(p)               ((void __iomem __force *)(p))
+#endif
+
+#endif /* __ASM_MACH_IO_H */