Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[sfrench/cifs-2.6.git] / include / sound / info.h

diff --git a/include/sound/info.h b/include/sound/info.h
index 8ea5c7497c03df2e83865d49fb87b783035ed921..f23d8381c216a0cfc9b9f5b2e1232c677987534d 100644 (file)
--- 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)