Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6-omap-h63xx.git] / arch / v850 / kernel / time.c

diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c
index f0905b03523bdd44765f03cb45251d05361fdd55..d810c93fe66567b3c5166860fd2b815fc6dc5359 100644 (file)
--- a/arch/v850/kernel/time.c
+++ b/arch/v850/kernel/time.c
@@ -92,12 +92,11 @@ static irqreturn_t timer_interrupt (int irq, void *dummy, struct pt_regs *regs)
 
 static int timer_dev_id;
 static struct irqaction timer_irqaction = {
-       timer_interrupt,
-       IRQF_DISABLED,
-       CPU_MASK_NONE,
-       "timer",
-       &timer_dev_id,
-       NULL
+       .handler = timer_interrupt,
+       .flags = IRQF_DISABLED,
+       .mask = CPU_MASK_NONE,
+       .name = "timer",
+       .dev_id = &timer_dev_id,
 };
 
 void time_init (void)