diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-03 03:21:23 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-03 03:21:23 (GMT) |
commit | 1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c (patch) | |
tree | ecfe847dda816361d83b1da6d7213b27721e7fd7 /arch/arm/kernel/irq.c | |
parent | a166222cde740b34d97fe49dca70348197f4534e (diff) | |
parent | e252630f1fd1d14ac4081e566d2f697ae1779215 (diff) | |
download | linux-fsl-qoriq-1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c.tar.xz |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3743/1: ARM: OMAP: Fix compile for OMAP
[ARM] 3739/1: genirq updates: irq_chip, add and use irq_chip.name
Diffstat (limited to 'arch/arm/kernel/irq.c')
-rw-r--r-- | arch/arm/kernel/irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 626feee..2e1bf83 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -77,6 +77,7 @@ int show_interrupts(struct seq_file *p, void *v) seq_printf(p, "%3d: ", i); for_each_present_cpu(cpu) seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]); + seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-"); seq_printf(p, " %s", action->name); for (action = action->next; action; action = action->next) seq_printf(p, ", %s", action->name); |