[PATCH 5/6] arm/ns9xxx: fix debug macro compilation failure
Jeremy Kerr
jeremy.kerr at canonical.com
Tue Jul 13 22:32:39 EDT 2010
We need mach/memory.h for NS9XXX_CSxSTAT_PHYS, and mach/memory.h needs
asm/memory.h for UL().
Signed-off-by: Jeremy Kerr <jeremy.kerr at canonical.com>
---
arch/arm/mach-ns9xxx/include/mach/debug-macro.S | 1 +
arch/arm/mach-ns9xxx/include/mach/memory.h | 2 ++
2 files changed, 3 insertions(+)
diff --git a/arch/arm/mach-ns9xxx/include/mach/debug-macro.S b/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
index ae770fd..06f41f7 100644
--- a/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
+++ b/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
@@ -8,6 +8,7 @@
* the Free Software Foundation.
*/
#include <mach/hardware.h>
+#include <mach/memory.h>
#include <mach/regs-board-a9m9750dev.h>
diff --git a/arch/arm/mach-ns9xxx/include/mach/memory.h b/arch/arm/mach-ns9xxx/include/mach/memory.h
index 6107193..b5bbda5 100644
--- a/arch/arm/mach-ns9xxx/include/mach/memory.h
+++ b/arch/arm/mach-ns9xxx/include/mach/memory.h
@@ -11,6 +11,8 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
+#include <asm/memory.h>
+
/* x in [0..3] */
#define NS9XXX_CSxSTAT_PHYS(x) UL(((x) + 4) << 28)
More information about the linux-arm-kernel
mailing list