From 03d2f7ddf87b701b2d9fec88844371d3ff34c33d Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 28 Aug 2007 09:02:56 +0000
Subject: [PATCH] --- yaml --- r: 69473 b: refs/heads/master c:
 1a10497cfb3ea79bed1470683d4ec5c189febaa6 h: refs/heads/master i:   69471:
 6bd851bfe680be5d96745f05a950f0f5dd86556e v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-clps7500/core.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ed8e611cced3..af3bbe650a70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b9ced769177a9e7a96d0e98a09cb5e6b1d506da
+refs/heads/master: 1a10497cfb3ea79bed1470683d4ec5c189febaa6
diff --git a/trunk/arch/arm/mach-clps7500/core.c b/trunk/arch/arm/mach-clps7500/core.c
index 4dde34f25e63..986205ec9269 100644
--- a/trunk/arch/arm/mach-clps7500/core.c
+++ b/trunk/arch/arm/mach-clps7500/core.c
@@ -193,7 +193,11 @@ static struct irq_chip clps7500_no_chip = {
 	.unmask	= cl7500_no_action,
 };
 
-static struct irqaction irq_isa = { no_action, 0, CPU_MASK_NONE, "isa", NULL, NULL };
+static struct irqaction irq_isa = {
+	.handler = no_action,
+	.mask = CPU_MASK_NONE,
+	.name = "isa",
+};
 
 static void __init clps7500_init_irq(void)
 {