Merge branch 'topic/ctxfi' into for-linus

[pandora-kernel.git] / include / sound / mixer_oss.h

diff --git a/include/sound/mixer_oss.h b/include/sound/mixer_oss.h
index ca5b482..51fbcb4 100644 (file)
--- a/include/sound/mixer_oss.h
+++ b/include/sound/mixer_oss.h
@@ -3,7 +3,7 @@
 
 /*
  *  OSS MIXER API
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -61,7 +61,7 @@ struct snd_mixer_oss {
                          unsigned int active_index);
        void *private_data_recsrc;
        void (*private_free_recsrc)(struct snd_mixer_oss *mixer);
-       struct semaphore reg_mutex;
+       struct mutex reg_mutex;
        struct snd_info_entry *proc_entry;
        int oss_dev_alloc;
        /* --- */