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 | |
parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
parent | 3d18c98367eac23555ea4887c4f570423474eeaf (diff) |
Merge branch 'fixes-for-linus' into mips-for-linux-next
Diffstat (limited to 'arch/mips/mm')
-rw-r--r-- | arch/mips/mm/c-octeon.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/tlb-r3k.c | 1 | ||||
-rw-r--r-- | arch/mips/mm/tlb-r4k.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c index daa81f7284a..cf7895db073 100644 --- a/arch/mips/mm/c-octeon.c +++ b/arch/mips/mm/c-octeon.c | |||
@@ -223,7 +223,7 @@ static void __cpuinit probe_octeon(void) | |||
223 | break; | 223 | break; |
224 | 224 | ||
225 | default: | 225 | default: |
226 | panic("Unsupported Cavium Networks CPU type\n"); | 226 | panic("Unsupported Cavium Networks CPU type"); |
227 | break; | 227 | break; |
228 | } | 228 | } |
229 | 229 | ||
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> |
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c index 0d394e0e883..d163455552b 100644 --- a/arch/mips/mm/tlb-r4k.c +++ b/arch/mips/mm/tlb-r4k.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/mmu_context.h> | 19 | #include <asm/mmu_context.h> |
20 | #include <asm/pgtable.h> | 20 | #include <asm/pgtable.h> |
21 | #include <asm/system.h> | 21 | #include <asm/system.h> |
22 | #include <asm/tlbmisc.h> | ||
22 | 23 | ||
23 | extern void build_tlb_refill_handler(void); | 24 | extern void build_tlb_refill_handler(void); |
24 | 25 | ||