diff options
Diffstat (limited to 'sound/pci/mixart/mixart.h')
-rw-r--r-- | sound/pci/mixart/mixart.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/mixart/mixart.h b/sound/pci/mixart/mixart.h index 3e84863ca02c..561634d5c007 100644 --- a/sound/pci/mixart/mixart.h +++ b/sound/pci/mixart/mixart.h | |||
@@ -24,6 +24,7 @@ | |||
24 | #define __SOUND_MIXART_H | 24 | #define __SOUND_MIXART_H |
25 | 25 | ||
26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
27 | #include <linux/mutex.h> | ||
27 | #include <sound/pcm.h> | 28 | #include <sound/pcm.h> |
28 | 29 | ||
29 | #define MIXART_DRIVER_VERSION 0x000100 /* 0.1.0 */ | 30 | #define MIXART_DRIVER_VERSION 0x000100 /* 0.1.0 */ |
@@ -92,9 +93,9 @@ struct mixart_mgr { | |||
92 | 93 | ||
93 | spinlock_t lock; /* interrupt spinlock */ | 94 | spinlock_t lock; /* interrupt spinlock */ |
94 | spinlock_t msg_lock; /* mailbox spinlock */ | 95 | spinlock_t msg_lock; /* mailbox spinlock */ |
95 | struct semaphore msg_mutex; /* mutex for blocking_requests */ | 96 | struct mutex msg_mutex; /* mutex for blocking_requests */ |
96 | 97 | ||
97 | struct semaphore setup_mutex; /* mutex used in hw_params, open and close */ | 98 | struct mutex setup_mutex; /* mutex used in hw_params, open and close */ |
98 | 99 | ||
99 | /* hardware interface */ | 100 | /* hardware interface */ |
100 | unsigned int dsp_loaded; /* bit flags of loaded dsp indices */ | 101 | unsigned int dsp_loaded; /* bit flags of loaded dsp indices */ |
@@ -107,7 +108,7 @@ struct mixart_mgr { | |||
107 | int sample_rate; | 108 | int sample_rate; |
108 | int ref_count_rate; | 109 | int ref_count_rate; |
109 | 110 | ||
110 | struct semaphore mixer_mutex; /* mutex for mixer */ | 111 | struct mutex mixer_mutex; /* mutex for mixer */ |
111 | 112 | ||
112 | }; | 113 | }; |
113 | 114 | ||