Merge branch 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / arch / sh / cchips / hd6446x / hd64465 / setup.c

diff --git a/arch/sh/cchips/hd6446x/hd64465/setup.c b/arch/sh/cchips/hd6446x/hd64465/setup.c
index d126e1f30dee60b99f0f959bd8755516c3618086..5cef0db4018b78eb00cbc5c285c18a66bc687be0 100644 (file)
--- a/arch/sh/cchips/hd6446x/hd64465/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64465/setup.c
@@ -147,7 +147,12 @@ int hd64465_irq_demux(int irq)
        return irq;
 }
 
-static struct irqaction irq0  = { hd64465_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64465", NULL, NULL};
+static struct irqaction irq0  = {
+       .handler = hd64465_interrupt,
+       .flags = IRQF_DISABLED,
+       .mask = CPU_MASK_NONE,
+       .name = "HD64465",
+};
 
 
 static int __init setup_hd64465(void)