From 1875b3515a75db73cd6c87854eb1a7c0be5d5b79 Mon Sep 17 00:00:00 2001
From: Sasha Levin <sasha.levin@oracle.com>
Date: Thu, 8 Nov 2012 10:23:03 +0000
Subject: [PATCH] --- yaml --- r: 340719 b: refs/heads/master c:
 c068e7774f6382a15e7a5ee7cd31ea662d2a5f97 h: refs/heads/master i:   340717:
 04e69b64b28871b409d61f7db2ed88a22048500f   340715:
 798babac324fa7d05c3a8db6e2e3cea3fa672cb5   340711:
 19cf23f895764d37f266ca11350aa2f94faeba6d   340703:
 480469b37468c33895e84294b451caab9986a99f v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ff41835d6da6..bc55d54c4e87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3b89fbba339aae533e380839fa078787635356e
+refs/heads/master: c068e7774f6382a15e7a5ee7cd31ea662d2a5f97
diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
index ce9d4f2c9776..49ca0bc0955f 100644
--- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1897,7 +1897,7 @@ vmxnet3_free_irqs(struct vmxnet3_adapter *adapter)
 		free_irq(adapter->pdev->irq, adapter->netdev);
 		break;
 	default:
-		BUG_ON(true);
+		BUG();
 	}
 }