diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-25 17:08:55 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-25 17:08:55 -0500 |
| commit | 0003cedfc577be9d679c16531f8720739e9637ed (patch) | |
| tree | 3b7a1e9087384706c8320f85f650ab96139e8c00 /arch/arm/mm/proc-xscale.S | |
| parent | 3ee357f0f38a5fddebab18500c290d3879a2d89c (diff) | |
| parent | c76b6b41d0ae29e1127d9f81cb687cabda57c14c (diff) | |
Merge nommu tree
Fix merge conflict in arch/arm/mm/proc-xscale.S
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/proc-xscale.S')
| -rw-r--r-- | arch/arm/mm/proc-xscale.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S index b50f87a0ee76..29bcc4dd6517 100644 --- a/arch/arm/mm/proc-xscale.S +++ b/arch/arm/mm/proc-xscale.S | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <asm/assembler.h> | 25 | #include <asm/assembler.h> |
| 26 | #include <asm/procinfo.h> | 26 | #include <asm/procinfo.h> |
| 27 | #include <asm/pgtable.h> | 27 | #include <asm/pgtable.h> |
| 28 | #include <asm/pgtable-hwdef.h> | ||
| 28 | #include <asm/page.h> | 29 | #include <asm/page.h> |
| 29 | #include <asm/ptrace.h> | 30 | #include <asm/ptrace.h> |
| 30 | #include "proc-macros.S" | 31 | #include "proc-macros.S" |