diff --git a/[refs] b/[refs]
index 142999332546..71b805cf5cd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60f1deb595c08687a96157a6a3ce08ef34142362
+refs/heads/master: 3182c8a72b31414e043184a97b0d5d3c0d590168
diff --git a/trunk/sound/oss/sound_timer.c b/trunk/sound/oss/sound_timer.c
index f0f0c19fbff7..48cda6c4c257 100644
--- a/trunk/sound/oss/sound_timer.c
+++ b/trunk/sound/oss/sound_timer.c
@@ -26,7 +26,7 @@ static unsigned long prev_event_time;
 static volatile unsigned long usecs_per_tmr;	/* Length of the current interval */
 
 static struct sound_lowlev_timer *tmr;
-static spinlock_t lock;
+static DEFINE_SPINLOCK(lock);
 
 static unsigned long tmr2ticks(int tmr_value)
 {