diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
| commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
| tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /arch/cris/arch-v10/mm/tlb.c | |
| parent | 838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff) | |
| parent | a622cf69b806bbb1887913c04e01d0c25b892876 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/cris/arch-v10/mm/tlb.c')
| -rw-r--r-- | arch/cris/arch-v10/mm/tlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/mm/tlb.c b/arch/cris/arch-v10/mm/tlb.c index 6baf5bd209e7..4a496e4ffacc 100644 --- a/arch/cris/arch-v10/mm/tlb.c +++ b/arch/cris/arch-v10/mm/tlb.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <asm/tlb.h> | 13 | #include <asm/tlb.h> |
| 14 | #include <asm/mmu_context.h> | 14 | #include <asm/mmu_context.h> |
| 15 | #include <asm/arch/svinto.h> | 15 | #include <arch/svinto.h> |
| 16 | 16 | ||
| 17 | #define D(x) | 17 | #define D(x) |
| 18 | 18 | ||