summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/irq.c
diff options
context:
space:
mode:
authorIngo Molnar2009-03-01 12:47:58 +0100
committerIngo Molnar2009-03-01 12:47:58 +0100
commit55f2b78995826d549401bdf20abeac1832636bb6 (patch)
tree931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /arch/mips/kernel/irq.c
parentRevert "gpu/drm, x86, PAT: PAT support for io_mapping_*" (diff)
parentx86: i915 needs pgprot_writecombine() and is_io_mapping_possible() (diff)
downloadkernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.tar.gz
kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.tar.xz
kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.zip
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'arch/mips/kernel/irq.c')
-rw-r--r--arch/mips/kernel/irq.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index a0ff2b66e22b..4b4007b3083a 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -111,7 +111,6 @@ int show_interrupts(struct seq_file *p, void *v)
seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
#endif
seq_printf(p, " %14s", irq_desc[i].chip->name);
- seq_printf(p, "-%-8s", irq_desc[i].name);
seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next)