diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-25 22:08:55 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-25 22:08:55 (GMT) |
commit | 0003cedfc577be9d679c16531f8720739e9637ed (patch) | |
tree | 3b7a1e9087384706c8320f85f650ab96139e8c00 /arch/arm/mach-sa1100 | |
parent | 3ee357f0f38a5fddebab18500c290d3879a2d89c (diff) | |
parent | c76b6b41d0ae29e1127d9f81cb687cabda57c14c (diff) | |
download | linux-fsl-qoriq-0003cedfc577be9d679c16531f8720739e9637ed.tar.xz |
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/mach-sa1100')
-rw-r--r-- | arch/arm/mach-sa1100/assabet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index a599bb0..c58f12b 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c @@ -26,6 +26,7 @@ #include <asm/irq.h> #include <asm/setup.h> #include <asm/page.h> +#include <asm/pgtable-hwdef.h> #include <asm/pgtable.h> #include <asm/tlbflush.h> |