summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kerr <jeremy.kerr@canonical.com>2010-07-22 16:34:34 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-26 10:33:05 +0100
commit9729c0ca197a5030d65937be6a1fb41b8d6f9c86 (patch)
tree85f7ec74a327b07f6f6f5519eda3a40e225b2027
parent64dd3b74de7aaa5a7a7dc2a5904a063899ee81cb (diff)
downloadlinux-3.10-9729c0ca197a5030d65937be6a1fb41b8d6f9c86.tar.gz
linux-3.10-9729c0ca197a5030d65937be6a1fb41b8d6f9c86.tar.bz2
linux-3.10-9729c0ca197a5030d65937be6a1fb41b8d6f9c86.zip
ARM: 6258/1: arm/h720x: fix debug macro compilation failure
IO_BASE shoule be IO_VIRT, and IO_START should be IO_PHYS. We also need mach/hardware.h for these definitions. Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-h720x/include/mach/debug-macro.S6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-h720x/include/mach/debug-macro.S b/arch/arm/mach-h720x/include/mach/debug-macro.S
index a9ee8f0d48b..27cafd12f03 100644
--- a/arch/arm/mach-h720x/include/mach/debug-macro.S
+++ b/arch/arm/mach-h720x/include/mach/debug-macro.S
@@ -11,8 +11,10 @@
*
*/
- .equ io_virt, IO_BASE
- .equ io_phys, IO_START
+#include <mach/hardware.h>
+
+ .equ io_virt, IO_VIRT
+ .equ io_phys, IO_PHYS
.macro addruart, rx, tmp
mrc p15, 0, \rx, c1, c0