]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[IA64] irqs: use `name' not `typename'
authorAndrew Morton <akpm@osdl.org>
Thu, 16 Nov 2006 08:42:58 +0000 (00:42 -0800)
committerTony Luck <tony.luck@intel.com>
Thu, 16 Nov 2006 17:37:45 +0000 (09:37 -0800)
`typename' is going away and is usually uninitialised anwyay.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/iosapic.c
arch/ia64/kernel/irq.c

index 9bf15fefa7e4e00517f2203cdde817b9299d9a14..c195fafc7aafcc87084995603282403af9691a2c 100644 (file)
@@ -664,7 +664,7 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
                        printk(KERN_WARNING
                               "%s: changing vector %d from %s to %s\n",
                               __FUNCTION__, vector,
-                              idesc->chip->typename, irq_type->typename);
+                              idesc->chip->name, irq_type->name);
                idesc->chip = irq_type;
        }
        return 0;
index f07c0864b0b424bd7743b310e89ee1868fe1af12..6fe404dff441dce239d4f523da2e8e8dbb913b8b 100644 (file)
@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, void *v)
                        seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
                }
 #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)