From d1e6a7d3902ffd2cfb210cebdb4a7d2e190f99bf Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Sun, 12 Feb 2012 15:40:10 -0600
Subject: [PATCH] --- yaml --- r: 297652 b: refs/heads/master c:
 33f7e3e18108f4cd1db93186caffdabcfe0e0c8f h: refs/heads/master v: v3

---
 [refs]                                                | 2 +-
 trunk/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 9 +++++++++
 trunk/arch/arm/mach-ep93xx/include/mach/io.h          | 9 ---------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5b374bfd5b99..a1ca2a64c744 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c38e25b6b9c64c8b2fc02c70095e70d97a3ace6
+refs/heads/master: 33f7e3e18108f4cd1db93186caffdabcfe0e0c8f
diff --git a/trunk/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/trunk/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
index c4a7b84ef06d..e711d0e021c7 100644
--- a/trunk/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
+++ b/trunk/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
@@ -5,6 +5,15 @@
 #ifndef __ASM_ARCH_EP93XX_REGS_H
 #define __ASM_ARCH_EP93XX_REGS_H
 
+/*
+ * A typesafe __io() variation for variable initialisers
+ */
+#ifdef __ASSEMBLER__
+#define IOMEM(p)                p
+#else
+#define IOMEM(p)                ((void __iomem __force *)(p))
+#endif
+
 /*
  * EP93xx Physical Memory Map:
  *
diff --git a/trunk/arch/arm/mach-ep93xx/include/mach/io.h b/trunk/arch/arm/mach-ep93xx/include/mach/io.h
index 594b77f21054..17e76ef14c30 100644
--- a/trunk/arch/arm/mach-ep93xx/include/mach/io.h
+++ b/trunk/arch/arm/mach-ep93xx/include/mach/io.h
@@ -10,13 +10,4 @@
 #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 */