diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 15:40:27 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 15:40:27 +0100 |
| commit | 5b0ec2efb7d373faa7b1a7632c459b93895d45cd (patch) | |
| tree | 4f9e12003a5acf46c1aea74e7835b4e72814bf93 /arch/mips/bcm47xx/setup.c | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
| parent | 3d18c98367eac23555ea4887c4f570423474eeaf (diff) | |
| download | linux-5b0ec2efb7d373faa7b1a7632c459b93895d45cd.tar.gz linux-5b0ec2efb7d373faa7b1a7632c459b93895d45cd.tar.bz2 linux-5b0ec2efb7d373faa7b1a7632c459b93895d45cd.zip | |
Merge branch 'fixes-for-linus' into mips-for-linux-next
Diffstat (limited to 'arch/mips/bcm47xx/setup.c')
| -rw-r--r-- | arch/mips/bcm47xx/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c index 1cfdda03546a..aab6b0c40a75 100644 --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c @@ -289,7 +289,7 @@ static void __init bcm47xx_register_ssb(void) err = ssb_bus_ssbbus_register(&(bcm47xx_bus.ssb), SSB_ENUM_BASE, bcm47xx_get_invariants); if (err) - panic("Failed to initialize SSB bus (err %d)\n", err); + panic("Failed to initialize SSB bus (err %d)", err); mcore = &bcm47xx_bus.ssb.mipscore; if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) { @@ -314,7 +314,7 @@ static void __init bcm47xx_register_bcma(void) err = bcma_host_soc_register(&bcm47xx_bus.bcma); if (err) - panic("Failed to initialize BCMA bus (err %d)\n", err); + panic("Failed to initialize BCMA bus (err %d)", err); } #endif |