diff --git a/[refs] b/[refs]
index 50f7065d36e4..030b362f4d3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d86d3a0101d958988a715abb7ea4687690f0b52f
+refs/heads/master: fc0cb7d166f3c8a318d8b0c9580cfe12fed9234c
diff --git a/trunk/drivers/staging/comedi/rt_pend_tq.c b/trunk/drivers/staging/comedi/rt_pend_tq.c
index 995f076e0af3..83ccf4da2952 100644
--- a/trunk/drivers/staging/comedi/rt_pend_tq.c
+++ b/trunk/drivers/staging/comedi/rt_pend_tq.c
@@ -25,7 +25,7 @@ volatile static struct rt_pend_tq rt_pend_tq[RT_PEND_TQ_SIZE];
 volatile static struct rt_pend_tq *volatile rt_pend_head = rt_pend_tq,
 	*volatile rt_pend_tail = rt_pend_tq;
 int rt_pend_tq_irq = 0;
-spinlock_t rt_pend_tq_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(rt_pend_tq_lock);
 
 // WARNING: following code not checked against race conditions yet.
 #define INC_CIRCULAR_PTR(ptr,begin,size) do {if(++(ptr)>=(begin)+(size)) (ptr)=(begin); } while(0)