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-arm6_7.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-arm6_7.S')
| -rw-r--r-- | arch/arm/mm/proc-arm6_7.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S index 8e7e1e70ab05..540359b475d0 100644 --- a/arch/arm/mm/proc-arm6_7.S +++ b/arch/arm/mm/proc-arm6_7.S | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <asm/assembler.h> | 15 | #include <asm/assembler.h> |
| 16 | #include <asm/asm-offsets.h> | 16 | #include <asm/asm-offsets.h> |
| 17 | #include <asm/pgtable-hwdef.h> | ||
| 17 | #include <asm/pgtable.h> | 18 | #include <asm/pgtable.h> |
| 18 | #include <asm/procinfo.h> | 19 | #include <asm/procinfo.h> |
| 19 | #include <asm/ptrace.h> | 20 | #include <asm/ptrace.h> |