aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/opl3.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-22 19:13:54 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-22 19:13:54 -0500
commitf01c18456993bab43067b678f56c87ca954aa43b (patch)
tree3e0cd0cdf1a57618202b46a7126125902e3ab832 /include/sound/opl3.h
parentMerge branch 'master' (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa (diff)
downloadlinux-dev-f01c18456993bab43067b678f56c87ca954aa43b.tar.xz
linux-dev-f01c18456993bab43067b678f56c87ca954aa43b.zip
Merge branch 'master'
Diffstat (limited to 'include/sound/opl3.h')
-rw-r--r--include/sound/opl3.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/opl3.h b/include/sound/opl3.h
index 83392641cb47..444907166f97 100644
--- a/include/sound/opl3.h
+++ b/include/sound/opl3.h
@@ -53,6 +53,7 @@
#include "driver.h"
#include <linux/time.h>
+#include <linux/mutex.h>
#include "core.h"
#include "hwdep.h"
#include "timer.h"
@@ -312,7 +313,7 @@ struct snd_opl3 {
int sys_timer_status; /* system timer run status */
spinlock_t sys_timer_lock; /* Lock for system timer access */
#endif
- struct semaphore access_mutex; /* locking */
+ struct mutex access_mutex; /* locking */
};
/* opl3.c */