From f01f922c647ddef8a484558e694377c180f3a459 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 17 Oct 2007 18:04:36 +0200
Subject: [PATCH] --- yaml --- r: 70979 b: refs/heads/master c:
 6a61f6a55708f5e50c4d78934199e7e9257e6aa2 h: refs/heads/master i:   70977:
 b72b0359eef604a3994ab2b0098def61201f6207   70975:
 ddb67dd27075f66bea76b120e1cefc711d819bf6 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/i8259_32.c    | 6 +++++-
 trunk/arch/x86/mach-default/setup.c | 6 +++++-
 trunk/arch/x86/mach-voyager/setup.c | 6 +++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 32eb6a697c3b..35d39cfb40a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d43be8ea8c92a41557dacde94ae73565cbc01f0
+refs/heads/master: 6a61f6a55708f5e50c4d78934199e7e9257e6aa2
diff --git a/trunk/arch/x86/kernel/i8259_32.c b/trunk/arch/x86/kernel/i8259_32.c
index 679bb33acbf1..d34a10cc13a7 100644
--- a/trunk/arch/x86/kernel/i8259_32.c
+++ b/trunk/arch/x86/kernel/i8259_32.c
@@ -349,7 +349,11 @@ static irqreturn_t math_error_irq(int cpl, void *dev_id)
  * New motherboards sometimes make IRQ 13 be a PCI interrupt,
  * so allow interrupt sharing.
  */
-static struct irqaction fpu_irq = { math_error_irq, 0, CPU_MASK_NONE, "fpu", NULL, NULL };
+static struct irqaction fpu_irq = {
+	.handler = math_error_irq,
+	.mask = CPU_MASK_NONE,
+	.name = "fpu",
+};
 
 void __init init_ISA_irqs (void)
 {
diff --git a/trunk/arch/x86/mach-default/setup.c b/trunk/arch/x86/mach-default/setup.c
index 1bd82983986d..3f08010f3517 100644
--- a/trunk/arch/x86/mach-default/setup.c
+++ b/trunk/arch/x86/mach-default/setup.c
@@ -35,7 +35,11 @@ void __init pre_intr_init_hook(void)
 /*
  * IRQ2 is cascade interrupt to second interrupt controller
  */
-static struct irqaction irq2 = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL};
+static struct irqaction irq2 = {
+	.handler = no_action,
+	.mask = CPU_MASK_NONE,
+	.name = "cascade",
+};
 
 /**
  * intr_init_hook - post gate setup interrupt initialisation
diff --git a/trunk/arch/x86/mach-voyager/setup.c b/trunk/arch/x86/mach-voyager/setup.c
index a0ab4002abcd..3bef977cb29b 100644
--- a/trunk/arch/x86/mach-voyager/setup.c
+++ b/trunk/arch/x86/mach-voyager/setup.c
@@ -18,7 +18,11 @@ void __init pre_intr_init_hook(void)
 /*
  * IRQ2 is cascade interrupt to second interrupt controller
  */
-static struct irqaction irq2 = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL};
+static struct irqaction irq2 = {
+	.handler = no_action,
+	.mask = CPU_MASK_NONE,
+	.name = "cascade",
+};
 
 void __init intr_init_hook(void)
 {