X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fpci%2Fmixart%2Fmixart.h;fp=sound%2Fpci%2Fmixart%2Fmixart.h;h=3e84863ca02ccc30fbf29d0880876d8e38ee405d;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=561634d5c0076aee392e022aa53d7745b251e4dc;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/sound/pci/mixart/mixart.h b/sound/pci/mixart/mixart.h
index 561634d5c..3e84863ca 100644
--- 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 */
 
 };