diff --git a/[refs] b/[refs]
index c1fb08dbd9b1..bfdeb3dc4ef6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb263e18f481199a04f7aab9454c18cd3dbdb218
+refs/heads/master: f7c3f96a41f16865e6422bfb919312a716b16552
diff --git a/trunk/drivers/net/ethernet/ibm/emac/mal.c b/trunk/drivers/net/ethernet/ibm/emac/mal.c
index 479e43e2f1ef..84c6b6cf9c14 100644
--- a/trunk/drivers/net/ethernet/ibm/emac/mal.c
+++ b/trunk/drivers/net/ethernet/ibm/emac/mal.c
@@ -738,13 +738,11 @@ static int __devexit mal_remove(struct platform_device *ofdev)
 	/* Synchronize with scheduled polling */
 	napi_disable(&mal->napi);
 
-	if (!list_empty(&mal->list)) {
+	if (!list_empty(&mal->list))
 		/* This is *very* bad */
-		printk(KERN_EMERG
+		WARN(1, KERN_EMERG
 		       "mal%d: commac list is not empty on remove!\n",
 		       mal->index);
-		WARN_ON(1);
-	}
 
 	dev_set_drvdata(&ofdev->dev, NULL);