Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6-omap-h63xx.git] / include / sound / seq_instr.h

diff --git a/include/sound/seq_instr.h b/include/sound/seq_instr.h
index db764f09efb7e2fa1a93b76a87e74b169d6975c7..f2db03bfd74e59c1329d1c6691438177439f8f9f 100644 (file)
--- a/include/sound/seq_instr.h
+++ b/include/sound/seq_instr.h
@@ -64,7 +64,7 @@ struct snd_seq_kinstr_list {
 
        spinlock_t lock;
        spinlock_t ops_lock;
-       struct semaphore ops_mutex;
+       struct mutex ops_mutex;
        unsigned long ops_flags;
 };