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/sgi-ip27 | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
| parent | 3d18c98367eac23555ea4887c4f570423474eeaf (diff) | |
| download | blackbird-op-linux-5b0ec2efb7d373faa7b1a7632c459b93895d45cd.tar.gz blackbird-op-linux-5b0ec2efb7d373faa7b1a7632c459b93895d45cd.zip | |
Merge branch 'fixes-for-linus' into mips-for-linux-next
Diffstat (limited to 'arch/mips/sgi-ip27')
| -rw-r--r-- | arch/mips/sgi-ip27/ip27-irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c index f90dce315e04..ec3782d31894 100644 --- a/arch/mips/sgi-ip27/ip27-irq.c +++ b/arch/mips/sgi-ip27/ip27-irq.c @@ -73,7 +73,7 @@ static inline int alloc_level(int cpu, int irq) level = find_first_zero_bit(hub->irq_alloc_mask, LEVELS_PER_SLICE); if (level >= LEVELS_PER_SLICE) - panic("Cpu %d flooded with devices\n", cpu); + panic("Cpu %d flooded with devices", cpu); __set_bit(level, hub->irq_alloc_mask); si->level_to_irq[level] = irq; @@ -96,7 +96,7 @@ static inline int find_level(cpuid_t *cpunum, int irq) } } - panic("Could not identify cpu/level for irq %d\n", irq); + panic("Could not identify cpu/level for irq %d", irq); } /* |
