Merge branches 'sh/serial-rework' and 'sh/oprofile'

[~andy/linux] / sound / drivers / opl4 / opl4_local.h

diff --git a/sound/drivers/opl4/opl4_local.h b/sound/drivers/opl4/opl4_local.h
index 7e088a4a2f4c5603ceacdf47468657664a94f2ce..470e5a758a0236d4c1604daeb2645fa23a328f83 100644 (file)
--- a/sound/drivers/opl4/opl4_local.h
+++ b/sound/drivers/opl4/opl4_local.h
@@ -182,7 +182,7 @@ struct snd_opl4 {
        struct snd_info_entry *proc_entry;
        int memory_access;
 #endif
-       struct semaphore access_mutex;
+       struct mutex access_mutex;
 
 #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
        int used;