From 93f9035e5d0bdb683a43f292735674d62cb673d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Sat, 31 Jan 2009 01:21:55 +0100
Subject: [PATCH] --- yaml --- r: 130835 b: refs/heads/master c:
 6fd7ad96d6c51ba15479cb74dcb189b666422394 h: refs/heads/master i:   130833:
 e5155ec10d197be78e5de1548cea636d9f9a3bc2   130831:
 70d9dfb1ec04c454e548abb8323e0e552aa9bd5b v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/kernel/irq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 335c63b2f9af..0d87c1675689 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08e445bd6a98fa09befe0cf6d67705324f913fc6
+refs/heads/master: 6fd7ad96d6c51ba15479cb74dcb189b666422394
diff --git a/trunk/arch/arm/kernel/irq.c b/trunk/arch/arm/kernel/irq.c
index 7141cee1fab7..363db186cb93 100644
--- a/trunk/arch/arm/kernel/irq.c
+++ b/trunk/arch/arm/kernel/irq.c
@@ -101,7 +101,7 @@ int show_interrupts(struct seq_file *p, void *v)
 /* Handle bad interrupts */
 static struct irq_desc bad_irq_desc = {
 	.handle_irq = handle_bad_irq,
-	.lock = SPIN_LOCK_UNLOCKED
+	.lock = __SPIN_LOCK_UNLOCKED(bad_irq_desc.lock),
 };
 
 /*