diff --git a/[refs] b/[refs]
index 2d8467cdbfd3..c2c29e110198 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b32e41bb97971161ad34ea69364c4f9ec3909151
+refs/heads/master: ccc942567e10d6a5d59c4d57f03d07b4110611ea
diff --git a/trunk/drivers/char/keyboard.c b/trunk/drivers/char/keyboard.c
index c06e86ad1dab..1b094509b1d2 100644
--- a/trunk/drivers/char/keyboard.c
+++ b/trunk/drivers/char/keyboard.c
@@ -109,7 +109,7 @@ struct kbd_struct kbd_table[MAX_NR_CONSOLES];
 static struct kbd_struct *kbd = kbd_table;
 
 struct vt_spawn_console vt_spawn_con = {
-	.lock = SPIN_LOCK_UNLOCKED,
+	.lock = __SPIN_LOCK_UNLOCKED(vt_spawn_con.lock),
 	.pid  = NULL,
 	.sig  = 0,
 };