diff --git a/[refs] b/[refs]
index 648bfb4531b5..f5aef062d47a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8f18b909c0a3f22630846207035c8b84bb252b8
+refs/heads/master: 7a2c477069fbd32f91598f05334003979b987a39
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 5bc6e5ecc493..f8914b92b664 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -260,9 +260,7 @@ int set_irq_wake(unsigned int irq, unsigned int on)
 		}
 	} else {
 		if (desc->wake_depth == 0) {
-			printk(KERN_WARNING "Unbalanced IRQ %d "
-					"wake disable\n", irq);
-			WARN_ON(1);
+			WARN(1, "Unbalanced IRQ %d wake disable\n", irq);
 		} else if (--desc->wake_depth == 0) {
 			ret = set_irq_wake_real(irq, on);
 			if (ret)