diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:29:32 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:29:32 +0000 |
commit | b93a4afcff7be859e30cad2a305731516057d6cf (patch) | |
tree | fb5fe55864e16527e453efd18790a34db22ee2a1 /arch/arm/plat-mxc/include/mach/hardware.h | |
parent | 62c132a8008991530839401674ce8e1b12b005d3 (diff) | |
parent | 9b1489e989695c4d502865f8bec616c0f17e99ab (diff) |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/hardware.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/hardware.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h index 78db75475f6..ebadf4ac43f 100644 --- a/arch/arm/plat-mxc/include/mach/hardware.h +++ b/arch/arm/plat-mxc/include/mach/hardware.h @@ -22,6 +22,15 @@ #include <asm/sizes.h> +#define IMX_IO_ADDRESS(addr, module) \ + ((void __force __iomem *) \ + (((unsigned long)((addr) - (module ## _BASE_ADDR)) < module ## _SIZE) ?\ + (addr) - (module ## _BASE_ADDR) + (module ## _BASE_ADDR_VIRT) : 0)) + +#ifdef CONFIG_ARCH_MX5 +#include <mach/mx51.h> +#endif + #ifdef CONFIG_ARCH_MX3 #include <mach/mx3x.h> #include <mach/mx31.h> |