diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-30 02:58:22 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-30 02:58:22 +0200 |
| commit | 79072f38909e3d9883317238887460c39ddcc4cb (patch) | |
| tree | 28369f5a844535ff836565eefd62695b0e890fa3 /include/sound/pcm.h | |
| parent | [PATCH] libata: increase LBA48 max sectors to 65535 (diff) | |
| parent | Merge branch 'mv-merge' (diff) | |
| download | linux-79072f38909e3d9883317238887460c39ddcc4cb.tar.xz linux-79072f38909e3d9883317238887460c39ddcc4cb.zip | |
Merge branch 'upstream'
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 { char id[64]; char name[80]; struct snd_pcm_str streams[2]; - struct semaphore open_mutex; + struct mutex open_mutex; wait_queue_head_t open_wait; void *private_data; void (*private_free) (struct snd_pcm *pcm); |