From: Alexander Nyberg Signed-off-by: Andrew Morton --- arch/x86_64/kernel/i8259.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff -puN arch/x86_64/kernel/i8259.c~x86_64-i8259c-iso99-structure-initialization arch/x86_64/kernel/i8259.c --- 25/arch/x86_64/kernel/i8259.c~x86_64-i8259c-iso99-structure-initialization 2005-04-26 03:18:49.841773112 -0700 +++ 25-akpm/arch/x86_64/kernel/i8259.c 2005-04-26 03:18:49.844772656 -0700 @@ -157,14 +157,13 @@ static unsigned int startup_8259A_irq(un } static struct hw_interrupt_type i8259A_irq_type = { - "XT-PIC", - startup_8259A_irq, - shutdown_8259A_irq, - enable_8259A_irq, - disable_8259A_irq, - mask_and_ack_8259A, - end_8259A_irq, - NULL + .typename = "XT-PIC", + .startup = startup_8259A_irq, + .shutdown = shutdown_8259A_irq, + .enable = enable_8259A_irq, + .disable = disable_8259A_irq, + .ack = mask_and_ack_8259A, + .end = end_8259A_irq, }; /* _