Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-drm-fsl-dcu.git] / include / sound / hwdep.h

diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
index c679e5b3111135385798c6f5f2987a51fe63e6a7..94c387b5d72429a7d5086849c558ec5df5f8566e 100644 (file)
--- a/include/sound/hwdep.h
+++ b/include/sound/hwdep.h
@@ -60,7 +60,7 @@ struct snd_hwdep {
        void *private_data;
        void (*private_free) (struct snd_hwdep *hwdep);
 
-       struct semaphore open_mutex;
+       struct mutex open_mutex;
        int used;
        unsigned int dsp_loaded;
        unsigned int exclusive: 1;