[ARM] Merge individual ARM sub-trees

[linux-2.6-omap-h63xx.git] / arch / arm / mm / proc-arm720.S

diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index 0e6946ab6e5bbc5de65ea7a60a2b6ac68ee904f7..c04c194da78503e11984c942130d50d4a0f0fc6b 100644 (file)
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -36,11 +36,13 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/elf.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
-#include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
+#include "proc-macros.S"
+
 /*
  * Function: arm720_proc_init (void)
  *        : arm720_proc_fin (void)