Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / sound / synth / emux / emux.c

diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index 7c8e328fae6274142c9253c7baf556af86e92792..573e3701c14f02f526bac8777d86fa922e36d2a0 100644 (file)
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -45,7 +45,7 @@ int snd_emux_new(struct snd_emux **remu)
                return -ENOMEM;
 
        spin_lock_init(&emu->voice_lock);
-       init_MUTEX(&emu->register_mutex);
+       mutex_init(&emu->register_mutex);
 
        emu->client = -1;
 #ifdef CONFIG_SND_SEQUENCER_OSS
@@ -63,6 +63,7 @@ int snd_emux_new(struct snd_emux **remu)
        return 0;
 }
 
+EXPORT_SYMBOL(snd_emux_new);
 
 /*
  */
@@ -136,6 +137,7 @@ int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, ch
        return 0;
 }
 
+EXPORT_SYMBOL(snd_emux_register);
 
 /*
  */
@@ -171,18 +173,8 @@ int snd_emux_free(struct snd_emux *emu)
        return 0;
 }
 
-
-EXPORT_SYMBOL(snd_emux_new);
-EXPORT_SYMBOL(snd_emux_register);
 EXPORT_SYMBOL(snd_emux_free);
 
-EXPORT_SYMBOL(snd_emux_terminate_all);
-EXPORT_SYMBOL(snd_emux_lock_voice);
-EXPORT_SYMBOL(snd_emux_unlock_voice);
-
-/* soundfont.c */
-EXPORT_SYMBOL(snd_sf_linear_to_log);
-
 
 /*
  *  INIT part