diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /include/asm-mips/mmu.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'include/asm-mips/mmu.h')
| -rw-r--r-- | include/asm-mips/mmu.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-mips/mmu.h b/include/asm-mips/mmu.h deleted file mode 100644 index 4063edd79623..000000000000 --- a/include/asm-mips/mmu.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef __ASM_MMU_H | ||
| 2 | #define __ASM_MMU_H | ||
| 3 | |||
| 4 | typedef unsigned long mm_context_t[NR_CPUS]; | ||
| 5 | |||
| 6 | #endif /* __ASM_MMU_H */ | ||