linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / pci / mixart / mixart.h

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