diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-02-12 15:40:10 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-06 21:34:41 -0600 |
| commit | 33f7e3e18108f4cd1db93186caffdabcfe0e0c8f (patch) | |
| tree | 725faed1dd5f5dd64e26ecbd8393a83bda53ef42 /arch/arm/mach-ep93xx | |
| parent | 6c38e25b6b9c64c8b2fc02c70095e70d97a3ace6 (diff) | |
| download | blackbird-op-linux-33f7e3e18108f4cd1db93186caffdabcfe0e0c8f.tar.gz blackbird-op-linux-33f7e3e18108f4cd1db93186caffdabcfe0e0c8f.zip | |
ARM: ep93xx: clean-up mach/io.h
Move ep93xx specifics in mach/io.h to ep93xx-regs.h.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <rmallon@gmail.com>
Diffstat (limited to 'arch/arm/mach-ep93xx')
| -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 */ |
