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

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

diff --git a/include/sound/util_mem.h b/include/sound/util_mem.h
index 69944bbb5445fb9476af87e40e5e2285b6e21733..a1fb706b59a6ec2855fefb8fa4b6596c9aeda2ff 100644 (file)
--- a/include/sound/util_mem.h
+++ b/include/sound/util_mem.h
@@ -1,5 +1,7 @@
 #ifndef __SOUND_UTIL_MEM_H
 #define __SOUND_UTIL_MEM_H
+
+#include <linux/mutex.h>
 /*
  *  Copyright (C) 2000 Takashi Iwai <tiwai@suse.de>
  *
@@ -40,7 +42,7 @@ struct snd_util_memhdr {
        int nblocks;                    /* # of allocated blocks */
        unsigned int used;              /* used memory size */
        int block_extra_size;           /* extra data size of chunk */
-       struct semaphore block_mutex;   /* lock */
+       struct mutex block_mutex;       /* lock */
 };
 
 /*