From bc93f750979ce56fc8bdeea5ecebd4a250cb7768 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 3 Oct 2007 15:02:14 +0900
Subject: [PATCH] --- yaml --- r: 68320 b: refs/heads/master c:
 948d12cbc30b85dc9effbaaf506b2eeefaefea07 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/arch/sh64/kernel/time.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6182772a715e..6841ea01172c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 090495b54fabc88169aedebb2b3831a3b9ef174c
+refs/heads/master: 948d12cbc30b85dc9effbaaf506b2eeefaefea07
diff --git a/trunk/arch/sh64/kernel/time.c b/trunk/arch/sh64/kernel/time.c
index b37f4f4981d2..06f3c179e345 100644
--- a/trunk/arch/sh64/kernel/time.c
+++ b/trunk/arch/sh64/kernel/time.c
@@ -476,8 +476,18 @@ static irqreturn_t sh64_rtc_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static struct irqaction irq0  = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL};
-static struct irqaction irq1  = { sh64_rtc_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "rtc", NULL, NULL};
+static struct irqaction irq0  = {
+	.handler = timer_interrupt,
+	.flags = IRQF_DISABLED,
+	.mask = CPU_MASK_NONE,
+	.name = "timer",
+};
+static struct irqaction irq1  = {
+	.handler = sh64_rtc_interrupt,
+	.flags = IRQF_DISABLED,
+	.mask = CPU_MASK_NONE,
+	.name = "rtc",
+};
 
 void __init time_init(void)
 {