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/pcm.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/sound/pcm.h')
| -rw-r--r-- | include/sound/pcm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 314268a11048..15b885660bf0 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
| @@ -420,7 +420,7 @@ struct snd_pcm { | |||
| 420 | char id[64]; | 420 | char id[64]; |
| 421 | char name[80]; | 421 | char name[80]; |
| 422 | struct snd_pcm_str streams[2]; | 422 | struct snd_pcm_str streams[2]; |
| 423 | struct semaphore open_mutex; | 423 | struct mutex open_mutex; |
| 424 | wait_queue_head_t open_wait; | 424 | wait_queue_head_t open_wait; |
| 425 | void *private_data; | 425 | void *private_data; |
| 426 | void (*private_free) (struct snd_pcm *pcm); | 426 | void (*private_free) (struct snd_pcm *pcm); |