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/arm/kernel | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 363db186cb93..7296f0416286 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
| @@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 76 | 76 | ||
| 77 | seq_printf(p, "%3d: ", i); | 77 | seq_printf(p, "%3d: ", i); |
| 78 | for_each_present_cpu(cpu) | 78 | for_each_present_cpu(cpu) |
| 79 | seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]); | 79 | seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu)); |
| 80 | seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-"); | 80 | seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-"); |
| 81 | seq_printf(p, " %s", action->name); | 81 | seq_printf(p, " %s", action->name); |
| 82 | for (action = action->next; action; action = action->next) | 82 | for (action = action->next; action; action = action->next) |