[PATCH] ARM: ep93xx: clean-up mach/io.h
From: Rob Herring <hidden>
Date: 2012-02-27 15:17:15
Subsystem:
arm port, arm/cirrus logic ep93xx arm architecture, the rest · Maintainers:
Russell King, Hartley Sweeten, Alexander Sverdlin, Nikita Shubin, Linus Torvalds
From: Rob Herring <redacted> Move ep93xx specifics in mach/io.h to ep93xx-regs.h. Signed-off-by: Rob Herring <redacted> Cc: Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ryan Mallon <redacted> --- arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 9 +++++++++ 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 c4a7b84..6e0625e 100644
--- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h@@ -25,6 +25,15 @@ * http://www.cirrus.com/en/pubs/appNote/AN273REV4.pdf */ +/* + * A typesafe __io() variation for variable initialisers + */ +#ifdef __ASSEMBLER__ +#define IOMEM(p) p +#else +#define IOMEM(p) ((void __iomem __force *)(p)) +#endif + #define EP93XX_CS0_PHYS_BASE_ASYNC 0x00000000 /* ASDO Pin = 0 */ #define EP93XX_SDCE3_PHYS_BASE_SYNC 0x00000000 /* ASDO Pin = 1 */ #define EP93XX_CS1_PHYS_BASE 0x10000000
diff --git a/arch/arm/mach-ep93xx/include/mach/io.h b/arch/arm/mach-ep93xx/include/mach/io.h
index 594b77f..17e76ef 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 */
--
1.7.5.4