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/c-octeon.c | |
parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
parent | 3d18c98367eac23555ea4887c4f570423474eeaf (diff) |
Merge branch 'fixes-for-linus' into mips-for-linux-next
Diffstat (limited to 'arch/mips/mm/c-octeon.c')
-rw-r--r-- | arch/mips/mm/c-octeon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c index daa81f7284ac..cf7895db0739 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 | ||