linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / drivers / opl3 / opl3_lib.c

diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
index 87fe376..1e0c76b 100644 (file)
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
@@ -316,8 +316,6 @@ void snd_opl3_interrupt(struct snd_hwdep * hw)
        }
 }
 
-EXPORT_SYMBOL(snd_opl3_interrupt);
-
 /*
 
  */
@@ -360,7 +358,7 @@ int snd_opl3_new(struct snd_card *card,
        opl3->hardware = hardware;
        spin_lock_init(&opl3->reg_lock);
        spin_lock_init(&opl3->timer_lock);
-       mutex_init(&opl3->access_mutex);
+       init_MUTEX(&opl3->access_mutex);
 
        if ((err = snd_device_new(card, SNDRV_DEV_CODEC, opl3, &ops)) < 0) {
                snd_opl3_free(opl3);
@@ -371,8 +369,6 @@ int snd_opl3_new(struct snd_card *card,
        return 0;
 }
 
-EXPORT_SYMBOL(snd_opl3_new);
-
 int snd_opl3_init(struct snd_opl3 *opl3)
 {
        if (! opl3->command) {
@@ -397,8 +393,6 @@ int snd_opl3_init(struct snd_opl3 *opl3)
        return 0;
 }
 
-EXPORT_SYMBOL(snd_opl3_init);
-
 int snd_opl3_create(struct snd_card *card,
                    unsigned long l_port,
                    unsigned long r_port,
@@ -457,8 +451,6 @@ int snd_opl3_create(struct snd_card *card,
        return 0;
 }
 
-EXPORT_SYMBOL(snd_opl3_create);
-
 int snd_opl3_timer_new(struct snd_opl3 * opl3, int timer1_dev, int timer2_dev)
 {
        int err;
@@ -476,8 +468,6 @@ int snd_opl3_timer_new(struct snd_opl3 * opl3, int timer1_dev, int timer2_dev)
        return 0;
 }
 
-EXPORT_SYMBOL(snd_opl3_timer_new);
-
 int snd_opl3_hwdep_new(struct snd_opl3 * opl3,
                       int device, int seq_device,
                       struct snd_hwdep ** rhwdep)
@@ -536,8 +526,17 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3,
        return 0;
 }
 
+EXPORT_SYMBOL(snd_opl3_interrupt);
+EXPORT_SYMBOL(snd_opl3_new);
+EXPORT_SYMBOL(snd_opl3_init);
+EXPORT_SYMBOL(snd_opl3_create);
+EXPORT_SYMBOL(snd_opl3_timer_new);
 EXPORT_SYMBOL(snd_opl3_hwdep_new);
 
+/* opl3_synth.c */
+EXPORT_SYMBOL(snd_opl3_regmap);
+EXPORT_SYMBOL(snd_opl3_reset);
+
 /*
  *  INIT part
  */