From 7cc60a1b1233af39380b01f09e247c555955c0d2 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 18 Feb 2011 23:27:23 +0100
Subject: [PATCH] --- yaml --- r: 233554 b: refs/heads/master c:
 6d83f94db95cfe65d2a6359cccdf61cf087c2598 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9465e2e9a095..7eb530e4e5da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1ee6264280e740a9d3ff3feef38642cf0a57013
+refs/heads/master: 6d83f94db95cfe65d2a6359cccdf61cf087c2598
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 0caa59f747dd..9033c1c70828 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -1100,7 +1100,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler,
 	if (retval)
 		kfree(action);
 
-#ifdef CONFIG_DEBUG_SHIRQ
+#ifdef CONFIG_DEBUG_SHIRQ_FIXME
 	if (!retval && (irqflags & IRQF_SHARED)) {
 		/*
 		 * It's a shared IRQ -- the driver ought to be prepared for it