diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:40:27 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:40:27 -0500 |
commit | 5b0ec2efb7d373faa7b1a7632c459b93895d45cd (patch) | |
tree | 4f9e12003a5acf46c1aea74e7835b4e72814bf93 /arch/mips/mm/tlb-r3k.c | |
parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
parent | 3d18c98367eac23555ea4887c4f570423474eeaf (diff) |
Merge branch 'fixes-for-linus' into mips-for-linux-next
Diffstat (limited to 'arch/mips/mm/tlb-r3k.c')
-rw-r--r-- | arch/mips/mm/tlb-r3k.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c index 87bb85d8d53..ed1fa460f84 100644 --- a/arch/mips/mm/tlb-r3k.c +++ b/arch/mips/mm/tlb-r3k.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <asm/pgtable.h> | 20 | #include <asm/pgtable.h> |
21 | #include <asm/mmu_context.h> | 21 | #include <asm/mmu_context.h> |
22 | #include <asm/system.h> | 22 | #include <asm/system.h> |
23 | #include <asm/tlbmisc.h> | ||
23 | #include <asm/isadep.h> | 24 | #include <asm/isadep.h> |
24 | #include <asm/io.h> | 25 | #include <asm/io.h> |
25 | #include <asm/bootinfo.h> | 26 | #include <asm/bootinfo.h> |