summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/irq.c
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-09-05 23:20:21 +0200
committerDave Jones <davej@redhat.com>2006-09-05 23:20:21 +0200
commit115b384cf87249d76adb0b21aca11ee22128927d (patch)
treef39a2a54863e9d82d1196906f92c82ab5991c6af /arch/arm/kernel/irq.c
parent[AGPGART] agp.h: constify struct agp_bridge_data::version (diff)
parentLinux 2.6.18-rc6 (diff)
downloadlinux-115b384cf87249d76adb0b21aca11ee22128927d.tar.xz
linux-115b384cf87249d76adb0b21aca11ee22128927d.zip
Merge ../linus
Diffstat (limited to 'arch/arm/kernel/irq.c')
-rw-r--r--arch/arm/kernel/irq.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 626feeec0ade..2e1bf830fe11 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);