diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 20:57:41 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 20:57:41 +0100 |
commit | dd7a5230cd651bfb119d222561c4032f30dd5659 (patch) | |
tree | 85628ef75d1f512f43df6f760980b6cce6cf40c7 /arch/cris/arch-v32/mm/init.c | |
parent | 050dc6944b9ca2186f4729ab44e0da3743933941 (diff) | |
parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) |
Merge commit 'v2.6.28-rc8' into x86/cpufeature
Diffstat (limited to 'arch/cris/arch-v32/mm/init.c')
-rw-r--r-- | arch/cris/arch-v32/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/mm/init.c b/arch/cris/arch-v32/mm/init.c index 8a34b8b74293..caeb921a92ea 100644 --- a/arch/cris/arch-v32/mm/init.c +++ b/arch/cris/arch-v32/mm/init.c @@ -16,8 +16,8 @@ #include <asm/mmu.h> #include <asm/io.h> #include <asm/mmu_context.h> -#include <asm/arch/hwregs/asm/mmu_defs_asm.h> -#include <asm/arch/hwregs/supp_reg.h> +#include <arch/hwregs/asm/mmu_defs_asm.h> +#include <arch/hwregs/supp_reg.h> extern void tlb_init(void); |