diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
| commit | f01c18456993bab43067b678f56c87ca954aa43b (patch) | |
| tree | 3e0cd0cdf1a57618202b46a7126125902e3ab832 /include/sound/emux_synth.h | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa (diff) | |
| download | linux-dev-f01c18456993bab43067b678f56c87ca954aa43b.tar.xz linux-dev-f01c18456993bab43067b678f56c87ca954aa43b.zip | |
Merge branch 'master'
Diffstat (limited to 'include/sound/emux_synth.h')
| -rw-r--r-- | include/sound/emux_synth.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/emux_synth.h b/include/sound/emux_synth.h index b2d6b2acc7c7..d8cb51b86c20 100644 --- a/include/sound/emux_synth.h +++ b/include/sound/emux_synth.h @@ -113,7 +113,7 @@ struct snd_emux { struct snd_emux_voice *voices; /* Voices (EMU 'channel') */ int use_time; /* allocation counter */ spinlock_t voice_lock; /* Lock for voice access */ - struct semaphore register_mutex; + struct mutex register_mutex; int client; /* For the sequencer client */ int ports[SNDRV_EMUX_MAX_PORTS]; /* The ports for this device */ struct snd_emux_port *portptrs[SNDRV_EMUX_MAX_PORTS]; |