Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[karo-tx-linux.git] / include / sound / seq_instr.h

diff --git a/include/sound/seq_instr.h b/include/sound/seq_instr.h
index db764f09efb7e2fa1a93b76a87e74b169d6975c7..93b0c51df5b0fa19a9797b17f70feb2ae5995ccc 100644 (file)
--- a/include/sound/seq_instr.h
+++ b/include/sound/seq_instr.h
@@ -3,7 +3,7 @@
 
 /*
  *  Main kernel header file for the ALSA sequencer
- *  Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -64,7 +64,7 @@ struct snd_seq_kinstr_list {
 
        spinlock_t lock;
        spinlock_t ops_lock;
-       struct semaphore ops_mutex;
+       struct mutex ops_mutex;
        unsigned long ops_flags;
 };