summaryrefslogtreecommitdiff
path: root/arch/tile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-09-26 18:31:08 +0200
committerIngo Molnar <mingo@elte.hu>2010-09-26 18:31:08 +0200
commit3ab41619749b35011bf51d6ce59301d9e8358a4b (patch)
tree37c08cdff560a1692f3347bc1103ac78ffc3728f /arch/tile
parent4fd0ef83b8c0b4af773935904032a1b51bb8b474 (diff)
parentd1ea13c6e2cce0106531852daaa93dd97aec9580 (diff)
Merge branch 'irq/core' into auto-latest
Diffstat (limited to 'arch/tile')
-rw-r--r--arch/tile/kernel/irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/irq.c b/arch/tile/kernel/irq.c
index 596c60086930..9a27d563fc30 100644
--- a/arch/tile/kernel/irq.c
+++ b/arch/tile/kernel/irq.c
@@ -208,7 +208,7 @@ static void tile_irq_chip_eoi(unsigned int irq)
}
static struct irq_chip tile_irq_chip = {
- .typename = "tile_irq_chip",
+ .name = "tile_irq_chip",
.ack = tile_irq_chip_ack,
.eoi = tile_irq_chip_eoi,
.mask = tile_irq_chip_mask,
@@ -288,7 +288,7 @@ int show_interrupts(struct seq_file *p, void *v)
for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
#endif
- seq_printf(p, " %14s", irq_desc[i].chip->typename);
+ seq_printf(p, " %14s", irq_desc[i].chip->name);
seq_printf(p, " %s", action->name);
for (action = action->next; action; action = action->next)