From bd899d3ae4521a88f89208c229458327bfb4645a Mon Sep 17 00:00:00 2001
From: Roland Dreier <rolandd@cisco.com>
Date: Fri, 15 Dec 2006 20:55:28 -0800
Subject: [PATCH] --- yaml --- r: 44633 b: refs/heads/master c:
 0b0df6f2079e731c44226a0673b07a166509a5de h: refs/heads/master i:   44631:
 2558783d54977c967c8bf338eb33bf64de9f9911 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/infiniband/hw/mthca/mthca_main.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 43fbd1e9dd89..e902fa3d82f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82da703ee685b69b921b20eb76b50e519ca9956c
+refs/heads/master: 0b0df6f2079e731c44226a0673b07a166509a5de
diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_main.c b/trunk/drivers/infiniband/hw/mthca/mthca_main.c
index 711c1b845f3f..44bc6cc734ab 100644
--- a/trunk/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/trunk/drivers/infiniband/hw/mthca/mthca_main.c
@@ -80,7 +80,7 @@ static int tune_pci = 0;
 module_param(tune_pci, int, 0444);
 MODULE_PARM_DESC(tune_pci, "increase PCI burst from the default set by BIOS if nonzero");
 
-struct mutex mthca_device_mutex;
+DEFINE_MUTEX(mthca_device_mutex);
 
 #define MTHCA_DEFAULT_NUM_QP            (1 << 16)
 #define MTHCA_DEFAULT_RDB_PER_QP        (1 << 2)
@@ -1362,8 +1362,6 @@ static int __init mthca_init(void)
 {
 	int ret;
 
-	mutex_init(&mthca_device_mutex);
-
 	mthca_validate_profile();
 
 	ret = mthca_catas_init();