aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 13:06:09 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 13:06:09 -0500
commit8098a7ef8946169cf8ffeb6f4d8130fc3651192e (patch)
tree90d2da5a7340a1cbaf5f779986d733a900b88f15 /arch/cris/kernel
parent4805a1b0e6d74feb6428c05116a2886a076ee341 (diff)
parentd8fe989e7368a26e4baf9acb55524c71e5c3a117 (diff)
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror: cris: Fixup last users of irq_chip->typename CRIS v32: Should index be positive?
Diffstat (limited to 'arch/cris/kernel')
-rw-r--r--arch/cris/kernel/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c
index b5ce0724a88f..6d7b9eda4036 100644
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
@@ -63,7 +63,7 @@ int show_interrupts(struct seq_file *p, void *v)
63 for_each_online_cpu(j) 63 for_each_online_cpu(j)
64 seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); 64 seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
65#endif 65#endif
66 seq_printf(p, " %14s", irq_desc[i].chip->typename); 66 seq_printf(p, " %14s", irq_desc[i].chip->name);
67 seq_printf(p, " %s", action->name); 67 seq_printf(p, " %s", action->name);
68 68
69 for (action=action->next; action; action = action->next) 69 for (action=action->next; action; action = action->next)