diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 21:24:06 +0100 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 21:24:06 +0100 |
| commit | 67ba37293e938208795d6a3562201bdb0cf43393 (patch) | |
| tree | 3522e949ff19f3809583bfb3fa3973ddf264689d /arch/tile/kernel/irq.c | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
| parent | 5bba6c56dc99ff88f79a79572e29ecf445710878 (diff) | |
Merge commit 'konrad/stable/xen-pcifront-0.8.2' into 2.6.36-rc8-initial-domain-v6
Diffstat (limited to 'arch/tile/kernel/irq.c')
| -rw-r--r-- | arch/tile/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/irq.c b/arch/tile/kernel/irq.c index 596c6008693..9a27d563fc3 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) |