Merge branch 'linus'

1 files changed, 2 insertions, 1 deletions

diff --git a/sound/oss/ymfpci.h b/sound/oss/ymfpci.h
index f810a100c641..ac1785f2b7e7 100644
--- a/sound/oss/ymfpci.h
+++ b/sound/oss/ymfpci.h
@@ -22,6 +22,7 @@
  *
  */
 #include <linux/config.h>
+#include <linux/mutex.h>
 
 /*
  *  Direct registers
@@ -279,7 +280,7 @@ struct ymf_unit {
 
         /* soundcore stuff */
         int dev_audio;
-        struct semaphore open_sem;
+        struct mutex open_mutex;
 
         struct list_head ymf_devs;
         struct list_head states;        /* List of states for this unit */