summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-lpc32xx/include/mach/hardware.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-10-11 11:55:04 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-10-11 11:55:04 +0200
commita0f0dd57f4a85310d9936f1770a0424b49fef876 (patch)
tree2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b /arch/arm/mach-lpc32xx/include/mach/hardware.h
parentARM: 7549/1: HYP: fix boot on some ARM1136 cores (diff)
parentARM: vfp: fix saving d16-d31 vfp registers on v6+ kernels (diff)
downloadlinux-a0f0dd57f4a85310d9936f1770a0424b49fef876.tar.xz
linux-a0f0dd57f4a85310d9936f1770a0424b49fef876.zip
Merge branch 'fixes' into for-linus
Conflicts: arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/mach-lpc32xx/include/mach/hardware.h')
-rw-r--r--arch/arm/mach-lpc32xx/include/mach/hardware.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-lpc32xx/include/mach/hardware.h b/arch/arm/mach-lpc32xx/include/mach/hardware.h
index 33e1dde37bd9..69065de97a3d 100644
--- a/arch/arm/mach-lpc32xx/include/mach/hardware.h
+++ b/arch/arm/mach-lpc32xx/include/mach/hardware.h
@@ -25,7 +25,7 @@
/*
* This macro relies on fact that for all HW i/o addresses bits 20-23 are 0
*/
-#define IO_ADDRESS(x) (((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\
+#define IO_ADDRESS(x) IOMEM(((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\
IO_BASE)
#define io_p2v(x) ((void __iomem *) (unsigned long) IO_ADDRESS(x))