From 926a516d8c7a6318adbb76432bde013ea29e8be6 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Mon, 12 Feb 2007 00:52:04 -0800
Subject: [PATCH] --- yaml --- r: 47902 b: refs/heads/master c:
 3f0504471536a2b6978b9a99ed1c222950fff07a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 24c41711b745..9f93da720ae8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a304e1b82808904c561b7b149b467e338c53fcce
+refs/heads/master: 3f0504471536a2b6978b9a99ed1c222950fff07a
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 400b12a63649..7c85d69188ef 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -328,12 +328,14 @@ int setup_irq(unsigned int irq, struct irqaction *new)
 	return 0;
 
 mismatch:
+#ifdef CONFIG_DEBUG_SHIRQ
 	if (!(new->flags & IRQF_PROBE_SHARED)) {
 		printk(KERN_ERR "IRQ handler type mismatch for IRQ %d\n", irq);
 		if (old_name)
 			printk(KERN_ERR "current handler: %s\n", old_name);
 		dump_stack();
 	}
+#endif
 	spin_unlock_irqrestore(&desc->lock, flags);
 	return -EBUSY;
 }