aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/info.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/info.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/info.h')
-rw-r--r--include/sound/info.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/info.h b/include/sound/info.h
index 8ea5c7497c03..f23d8381c216 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -84,7 +84,7 @@ struct snd_info_entry {
void *private_data;
void (*private_free)(struct snd_info_entry *entry);
struct proc_dir_entry *p;
- struct semaphore access;
+ struct mutex access;
};
#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)