Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[karo-tx-linux.git] / include / sound / soundfont.h

diff --git a/include/sound/soundfont.h b/include/sound/soundfont.h
index 61a010c65d0278d4c82711b7f6651b7204de6168..f95d99ba7f7473028b497932cda5493805f0b6c0 100644 (file)
--- a/include/sound/soundfont.h
+++ b/include/sound/soundfont.h
@@ -93,7 +93,7 @@ struct snd_sf_list {
        int sample_locked;      /* locked time for sample */
        struct snd_sf_callback callback;        /* callback functions */
        int presets_locked;
-       struct semaphore presets_mutex;
+       struct mutex presets_mutex;
        spinlock_t lock;
        struct snd_util_memhdr *memhdr;
 };