From 0da3243bfd7b00e934ffca831d0fba1c6ff1c0fa Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Fri, 25 Jul 2008 19:45:36 -0700
Subject: [PATCH] --- yaml --- r: 106196 b: refs/heads/master c:
 b8c512f6190e313df69060bae4a161c5c044e272 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a214a686af53..559244dac660 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51cc50685a4275c6a02653670af9f108a64e01cf
+refs/heads/master: b8c512f6190e313df69060bae4a161c5c044e272
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index f8914b92b664..152abfd3589f 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -177,8 +177,7 @@ static void __enable_irq(struct irq_desc *desc, unsigned int irq)
 {
 	switch (desc->depth) {
 	case 0:
-		printk(KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);
-		WARN_ON(1);
+		WARN(1, KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);
 		break;
 	case 1: {
 		unsigned int status = desc->status & ~IRQ_DISABLED;