diff options
| author | Michal Marek <mmarek@suse.cz> | 2011-03-09 10:15:44 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-03-09 10:15:44 -0500 |
| commit | 2d8ad8719591fa803b0d589ed057fa46f49b7155 (patch) | |
| tree | 4ae051577dad1161c91dafbf4207bb10a9dc91bb /arch/m32r/kernel/irq.c | |
| parent | 9b4ce7bce5f30712fd926ab4599a803314a07719 (diff) | |
| parent | c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff) | |
Merge commit 'v2.6.38-rc1' into kbuild/packaging
Diffstat (limited to 'arch/m32r/kernel/irq.c')
| -rw-r--r-- | arch/m32r/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c index 3c71f776872c..7db26f1f082d 100644 --- a/arch/m32r/kernel/irq.c +++ b/arch/m32r/kernel/irq.c | |||
| @@ -51,7 +51,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 51 | for_each_online_cpu(j) | 51 | for_each_online_cpu(j) |
| 52 | seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); | 52 | seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); |
| 53 | #endif | 53 | #endif |
| 54 | seq_printf(p, " %14s", irq_desc[i].chip->typename); | 54 | seq_printf(p, " %14s", irq_desc[i].chip->name); |
| 55 | seq_printf(p, " %s", action->name); | 55 | seq_printf(p, " %s", action->name); |
| 56 | 56 | ||
| 57 | for (action=action->next; action; action = action->next) | 57 | for (action=action->next; action; action = action->next) |