diff options
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/io.h | 9 |
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 @@ #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: * * 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 @@ #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 */ |