linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/sound/pci/pcxhr/pcxhr.h b/sound/pci/pcxhr/pcxhr.h
index 6520647..049f2b3 100644 (file)
--- a/sound/pci/pcxhr/pcxhr.h
+++ b/sound/pci/pcxhr/pcxhr.h
@@ -24,7 +24,6 @@
 #define __SOUND_PCXHR_H
 
 #include <linux/interrupt.h>
-#include <linux/mutex.h>
 #include <sound/pcm.h>
 
 #define PCXHR_DRIVER_VERSION           0x000804        /* 0.8.4 */
@@ -77,8 +76,8 @@ struct pcxhr_mgr {
        spinlock_t lock;                /* interrupt spinlock */
        spinlock_t msg_lock;            /* message spinlock */
 
-       struct mutex setup_mutex;       /* mutex used in hw_params, open and close */
-       struct mutex mixer_mutex;       /* mutex for mixer */
+       struct semaphore setup_mutex;   /* mutex used in hw_params, open and close */
+       struct semaphore mixer_mutex;   /* mutex for mixer */
 
        /* hardware interface */
        unsigned int dsp_loaded;        /* bit flags of loaded dsp indices */