Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

[deliverable/linux.git] / sound / pci / mixart / mixart.h

diff --git a/sound/pci/mixart/mixart.h b/sound/pci/mixart/mixart.h
index 3e84863ca02ccc30fbf29d0880876d8e38ee405d..561634d5c0076aee392e022aa53d7745b251e4dc 100644 (file)
--- a/sound/pci/mixart/mixart.h
+++ b/sound/pci/mixart/mixart.h
@@ -24,6 +24,7 @@
 #define __SOUND_MIXART_H
 
 #include <linux/interrupt.h>
+#include <linux/mutex.h>
 #include <sound/pcm.h>
 
 #define MIXART_DRIVER_VERSION  0x000100        /* 0.1.0 */
@@ -92,9 +93,9 @@ struct mixart_mgr {
 
        spinlock_t lock;              /* interrupt spinlock */
        spinlock_t msg_lock;          /* mailbox spinlock */
-       struct semaphore msg_mutex;   /* mutex for blocking_requests */
+       struct mutex msg_mutex;   /* mutex for blocking_requests */
 
-       struct semaphore setup_mutex; /* mutex used in hw_params, open and close */
+       struct mutex setup_mutex; /* mutex used in hw_params, open and close */
 
        /* hardware interface */
        unsigned int dsp_loaded;      /* bit flags of loaded dsp indices */
@@ -107,7 +108,7 @@ struct mixart_mgr {
        int sample_rate;
        int ref_count_rate;
 
-       struct semaphore mixer_mutex; /* mutex for mixer */
+       struct mutex mixer_mutex; /* mutex for mixer */
 
 };