diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /arch/cris/kernel/irq.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/cris/kernel/irq.c')
| -rw-r--r-- | arch/cris/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c index 2dfac8c79090..7f642fcffbfc 100644 --- a/arch/cris/kernel/irq.c +++ b/arch/cris/kernel/irq.c | |||
| @@ -66,7 +66,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 66 | seq_printf(p, "%10u ", kstat_irqs(i)); | 66 | seq_printf(p, "%10u ", kstat_irqs(i)); |
| 67 | #else | 67 | #else |
| 68 | for_each_online_cpu(j) | 68 | for_each_online_cpu(j) |
| 69 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); | 69 | seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); |
| 70 | #endif | 70 | #endif |
| 71 | seq_printf(p, " %14s", irq_desc[i].chip->typename); | 71 | seq_printf(p, " %14s", irq_desc[i].chip->typename); |
| 72 | seq_printf(p, " %s", action->name); | 72 | seq_printf(p, " %s", action->name); |