aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h9
-rw-r--r--arch/arm/mach-ep93xx/include/mach/io.h9
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
index c4a7b84ef06d..e711d0e021c7 100644
--- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
@@ -6,6 +6,15 @@
6#define __ASM_ARCH_EP93XX_REGS_H 6#define __ASM_ARCH_EP93XX_REGS_H
7 7
8/* 8/*
9 * A typesafe __io() variation for variable initialisers
10 */
11#ifdef __ASSEMBLER__
12#define IOMEM(p) p
13#else
14#define IOMEM(p) ((void __iomem __force *)(p))
15#endif
16
17/*
9 * EP93xx Physical Memory Map: 18 * EP93xx Physical Memory Map:
10 * 19 *
11 * The ASDO pin is sampled at system reset to select a synchronous or 20 * The ASDO pin is sampled at system reset to select a synchronous or
diff --git a/arch/arm/mach-ep93xx/include/mach/io.h b/arch/arm/mach-ep93xx/include/mach/io.h
index 594b77f21054..17e76ef14c30 100644
--- a/arch/arm/mach-ep93xx/include/mach/io.h
+++ b/arch/arm/mach-ep93xx/include/mach/io.h
@@ -10,13 +10,4 @@
10#define __io(p) __typesafe_io(p) 10#define __io(p) __typesafe_io(p)
11#define __mem_pci(p) (p) 11#define __mem_pci(p) (p)
12 12
13/*
14 * A typesafe __io() variation for variable initialisers
15 */
16#ifdef __ASSEMBLER__
17#define IOMEM(p) p
18#else
19#define IOMEM(p) ((void __iomem __force *)(p))
20#endif
21
22#endif /* __ASM_MACH_IO_H */ 13#endif /* __ASM_MACH_IO_H */