diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 19:17:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 19:17:37 -0500 |
commit | 3f5e573a08a369bd10d2f89b63a2d68843f64a6b (patch) | |
tree | 069a5636974c783adc6251f71d71cd2b0aa49cc9 /arch/mips/kernel/irq.c | |
parent | 9232d5876e83921414de65d82edd1098258f6680 (diff) | |
parent | 2cafe978462bc4016392aa330bf501a674679a86 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Import updates from i386's i8259.c
[MIPS] *-berr: Header inclusions for DEC bus error handlers
[MIPS] Compile __do_IRQ() when really needed
[MIPS] genirq: use name instead of typename
[MIPS] Do not use handle_level_irq for ioasic_dma_irq_type.
[MIPS] pte_offset(dir,addr): parenthesis fix
Diffstat (limited to 'arch/mips/kernel/irq.c')
-rw-r--r-- | arch/mips/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index b339798b3172..2fe4c868a801 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c | |||
@@ -117,7 +117,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
117 | for_each_online_cpu(j) | 117 | for_each_online_cpu(j) |
118 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); | 118 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); |
119 | #endif | 119 | #endif |
120 | seq_printf(p, " %14s", irq_desc[i].chip->typename); | 120 | seq_printf(p, " %14s", irq_desc[i].chip->name); |
121 | seq_printf(p, " %s", action->name); | 121 | seq_printf(p, " %s", action->name); |
122 | 122 | ||
123 | for (action=action->next; action; action = action->next) | 123 | for (action=action->next; action; action = action->next) |