diff --git a/[refs] b/[refs]
index cc2c6ff77d22..b62b6fee61de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf6350a3dfcbd0a0811d7c210beacb66e90eca47
+refs/heads/master: 6027f661f8da653f084df80f4aade21359bcea35
diff --git a/trunk/drivers/sbus/char/cpwatchdog.c b/trunk/drivers/sbus/char/cpwatchdog.c
index 7b5773d88212..a4e758143665 100644
--- a/trunk/drivers/sbus/char/cpwatchdog.c
+++ b/trunk/drivers/sbus/char/cpwatchdog.c
@@ -154,7 +154,7 @@ struct wd_device {
 };
 
 static struct wd_device wd_dev = { 
-		0, SPIN_LOCK_UNLOCKED, 0, 0, 0, 0,
+		0, __SPIN_LOCK_UNLOCKED(wd_dev.lock), 0, 0, 0, 0,
 };
 
 static struct timer_list wd_timer;