patch-2.1.102 linux/drivers/sound/opl3sa.c

• Lines: 46
• Date: Thu May 14 10:33:17 1998
• Orig file: v2.1.101/linux/drivers/sound/opl3sa.c
• Orig date: Wed Apr 8 19:36:27 1998

diff -u --recursive --new-file v2.1.101/linux/drivers/sound/opl3sa.c linux/drivers/sound/opl3sa.c
@@ -1,5 +1,5 @@
 /*
- * sound/Xopl3sa.c
+ * sound/opl3sa.c
  *
  * Low level driver for Yamaha YMF701B aka OPL3-SA chip
  * 
@@ -19,10 +19,12 @@
  */
  
 #include <linux/config.h>
+#include <linux/module.h>
 
 #undef  SB_OK
 
 #include "sound_config.h"
+#include "soundmodule.h"
 #ifdef SB_OK
 #include "sb.h"
 static int sb_initialized = 0;
@@ -293,6 +295,7 @@
 
 struct address_info cfg;
 struct address_info mpu_cfg;
+static int found_mpu;
 
 int init_module(void)
 {
@@ -312,7 +315,7 @@
 	if (probe_opl3sa_wss(&cfg) == 0)
 		return -ENODEV;
 
-	found_mpu=probe_opl3_mpu(&mpu_cfg);
+	found_mpu=probe_opl3sa_mpu(&mpu_cfg);
 
 	attach_opl3sa_wss(&cfg);
 	if(found_mpu)
@@ -325,7 +328,7 @@
 {
 	if(found_mpu)
 		unload_opl3sa_mpu(&mpu_cfg);
-	unload_opl3sa(&cfg);
+	unload_opl3sa_wss(&cfg);
 	SOUND_LOCK_END;
 }