diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-25 23:08:55 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-25 23:08:55 +0100 |
| commit | 0003cedfc577be9d679c16531f8720739e9637ed (patch) | |
| tree | 3b7a1e9087384706c8320f85f650ab96139e8c00 /arch/arm/mm/proc-arm1020.S | |
| parent | [ARM] 3399/1: Fix link problem when CONFIG_PRINTK is disabled (diff) | |
| parent | [ARM] nommu: rename compressed/head.S symbols to a new style (diff) | |
| download | linux-0003cedfc577be9d679c16531f8720739e9637ed.tar.xz linux-0003cedfc577be9d679c16531f8720739e9637ed.zip | |
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-arm1020.S')
| -rw-r--r-- | arch/arm/mm/proc-arm1020.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S index 3aa80094012c..959588884fa5 100644 --- a/arch/arm/mm/proc-arm1020.S +++ b/arch/arm/mm/proc-arm1020.S @@ -29,6 +29,7 @@ #include <linux/init.h> #include <asm/assembler.h> #include <asm/asm-offsets.h> +#include <asm/pgtable-hwdef.h> #include <asm/pgtable.h> #include <asm/procinfo.h> #include <asm/ptrace.h> |