Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[karo-tx-linux.git] / sound / core / seq / seq_queue.h

diff --git a/sound/core/seq/seq_queue.h b/sound/core/seq/seq_queue.h
index 888438599387bf372d15b02452858f82b9710db0..30c8111477f61ed26987dc03abbe9670b36db221 100644 (file)
--- a/sound/core/seq/seq_queue.h
+++ b/sound/core/seq/seq_queue.h
@@ -54,7 +54,7 @@ struct snd_seq_queue {
        /* clients which uses this queue (bitmap) */
        DECLARE_BITMAP(clients_bitmap, SNDRV_SEQ_MAX_CLIENTS);
        unsigned int clients;   /* users of this queue */
-       struct semaphore timer_mutex;
+       struct mutex timer_mutex;
 
        snd_use_lock_t use_lock;
 };