diff options
| -rw-r--r-- | arch/cris/arch-v10/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/cris/kernel/irq.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c index 5d75f77f9c73..1a61efc13982 100644 --- a/arch/cris/arch-v10/kernel/irq.c +++ b/arch/cris/arch-v10/kernel/irq.c | |||
| @@ -133,7 +133,7 @@ static void end_crisv10_irq(unsigned int irq) | |||
| 133 | } | 133 | } |
| 134 | 134 | ||
| 135 | static struct irq_chip crisv10_irq_type = { | 135 | static struct irq_chip crisv10_irq_type = { |
| 136 | .typename = "CRISv10", | 136 | .name = "CRISv10", |
| 137 | .startup = startup_crisv10_irq, | 137 | .startup = startup_crisv10_irq, |
| 138 | .shutdown = shutdown_crisv10_irq, | 138 | .shutdown = shutdown_crisv10_irq, |
| 139 | .enable = enable_crisv10_irq, | 139 | .enable = enable_crisv10_irq, |
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c index 57668db25031..b6241198fb98 100644 --- a/arch/cris/arch-v32/kernel/irq.c +++ b/arch/cris/arch-v32/kernel/irq.c | |||
| @@ -336,7 +336,7 @@ int set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest) | |||
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | static struct irq_chip crisv32_irq_type = { | 338 | static struct irq_chip crisv32_irq_type = { |
| 339 | .typename = "CRISv32", | 339 | .name = "CRISv32", |
| 340 | .startup = startup_crisv32_irq, | 340 | .startup = startup_crisv32_irq, |
| 341 | .shutdown = shutdown_crisv32_irq, | 341 | .shutdown = shutdown_crisv32_irq, |
| 342 | .enable = enable_crisv32_irq, | 342 | .enable = enable_crisv32_irq, |
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c index 0ca7d9892cc6..48fbdbdb58a8 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) |
