}
 
 static struct irq_chip pnx833x_pic_irq_type = {
-       .typename = "PNX-PIC",
+       .name = "PNX-PIC",
        .startup = pnx833x_startup_pic_irq,
        .shutdown = pnx833x_shutdown_pic_irq,
        .enable = pnx833x_enable_pic_irq,
 };
 
 static struct irq_chip pnx833x_gpio_irq_type = {
-       .typename = "PNX-GPIO",
+       .name = "PNX-GPIO",
        .startup = pnx833x_startup_gpio_irq,
        .shutdown = pnx833x_disable_gpio_irq,
        .enable = pnx833x_enable_gpio_irq,
 
 }
 
 static struct irq_chip a20r_irq_type = {
-       .typename       = "A20R",
+       .name           = "A20R",
        .ack            = mask_a20r_irq,
        .mask           = mask_a20r_irq,
        .mask_ack       = mask_a20r_irq,
 
 }
 
 static struct irq_chip pcimt_irq_type = {
-       .typename = "PCIMT",
+       .name = "PCIMT",
        .ack = disable_pcimt_irq,
        .mask = disable_pcimt_irq,
        .mask_ack = disable_pcimt_irq,
 
 }
 
 static struct irq_chip pcit_irq_type = {
-       .typename = "PCIT",
+       .name = "PCIT",
        .ack = disable_pcit_irq,
        .mask = disable_pcit_irq,
        .mask_ack = disable_pcit_irq,
 
 }
 
 static struct irq_chip rm200_irq_type = {
-       .typename = "RM200",
+       .name = "RM200",
        .ack = disable_rm200_irq,
        .mask = disable_rm200_irq,
        .mask_ack = disable_rm200_irq,