diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 14:50:00 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 14:50:00 (GMT) |
commit | 2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29 (patch) | |
tree | 62a49268a6baa58b25c76e5deae21f9b49bcc626 /arch/sh/kernel/irq.c | |
parent | 5cfc35cf79d46af998346e3d5cc66fa344d1af0e (diff) | |
parent | 66a740572d7bcb18469e71cb014bfed3ff75a773 (diff) | |
download | linux-fsl-qoriq-2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29.tar.xz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Convert INTC2 to IRQ table registration.
sh: Updates for irq-flow-type naming changes.
sh: Add some missing board headers.
sh: Fix exception_handling_table alignment.
sh: Cleanup board header directories.
sh: Remove board-specific ide.h headers.
sh: Proper show_stack/show_trace() implementation.
Diffstat (limited to 'arch/sh/kernel/irq.c')
-rw-r--r-- | arch/sh/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index acf2602..944128c 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c @@ -54,7 +54,7 @@ int show_interrupts(struct seq_file *p, void *v) for_each_online_cpu(j) seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); seq_printf(p, " %14s", irq_desc[i].chip->name); - seq_printf(p, "-%s", handle_irq_name(irq_desc[i].handle_irq)); + seq_printf(p, "-%-8s", irq_desc[i].name); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) |