diff --git a/[refs] b/[refs]
index b9e3502c0245..797b75cb4288 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 530ddf8563df4d7af8f8bdd99fa478c63805d0e3
+refs/heads/master: 3f4577bff8b8d03e56f1b62bedca5cd3b18f919a
diff --git a/trunk/drivers/staging/meilhaus/memain.c b/trunk/drivers/staging/meilhaus/memain.c
index b09d1a6c766c..66bb4ec7dc47 100644
--- a/trunk/drivers/staging/meilhaus/memain.c
+++ b/trunk/drivers/staging/meilhaus/memain.c
@@ -79,7 +79,7 @@ MODULE_PARM(major, "i");
 
 static struct file *me_filep = NULL;
 static int me_count = 0;
-static spinlock_t me_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(me_lock);
 static DECLARE_RWSEM(me_rwsem);
 
 /* Board instances are kept in a global list */