diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/sound/cs4231.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/sound/cs4231.h')
| -rw-r--r-- | include/sound/cs4231.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/cs4231.h b/include/sound/cs4231.h index ac6a5d882088..60b5b92a1319 100644 --- a/include/sound/cs4231.h +++ b/include/sound/cs4231.h | |||
| @@ -248,8 +248,8 @@ struct snd_cs4231 { | |||
| 248 | unsigned int c_dma_size; | 248 | unsigned int c_dma_size; |
| 249 | 249 | ||
| 250 | spinlock_t reg_lock; | 250 | spinlock_t reg_lock; |
| 251 | struct semaphore mce_mutex; | 251 | struct mutex mce_mutex; |
| 252 | struct semaphore open_mutex; | 252 | struct mutex open_mutex; |
| 253 | 253 | ||
| 254 | int (*rate_constraint) (struct snd_pcm_runtime *runtime); | 254 | int (*rate_constraint) (struct snd_pcm_runtime *runtime); |
| 255 | void (*set_playback_format) (struct snd_cs4231 *chip, struct snd_pcm_hw_params *hw_params, unsigned char pdfr); | 255 | void (*set_playback_format) (struct snd_cs4231 *chip, struct snd_pcm_hw_params *hw_params, unsigned char pdfr); |