Back out statification and restore a declaration that got lost.

2 files changed, 8 insertions, 4 deletions

diff --git a/sys/i386/isa/sound/ad1848.c b/sys/i386/isa/sound/ad1848.c
index 8683d53..e41edd9 100644
--- a/sys/i386/isa/sound/ad1848.c
+++ b/sys/i386/isa/sound/ad1848.c
@@ -57,6 +57,10 @@
 #include <i386/isa/sound/ad1848_mixer.h>
 #include <i386/isa/sound/iwdefs.h>
 
+#if !defined(CONFIG_CS4232) 
+extern struct isa_driver mssdriver;
+#endif
+
 extern void     IwaveStopDma(BYTE path);
 
 typedef struct {
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 13b1400..f1e179b 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -107,8 +107,8 @@ static void     sound_mem_init(void);
  */
 
 struct isa_driver opldriver = {sndprobe, sndattach, "opl"};
-static struct isa_driver trixdriver = {sndprobe, sndattach, "trix"};
-static struct isa_driver trixsbdriver = {sndprobe, sndattach, "trixsb"};
+struct isa_driver trixdriver = {sndprobe, sndattach, "trix"};
+struct isa_driver trixsbdriver = {sndprobe, sndattach, "trixsb"};
 struct isa_driver sbdriver = {sndprobe, sndattach, "sb"};
 struct isa_driver sbxvidriver = {sndprobe, sndattach, "sbxvi"};
 struct isa_driver sbmididriver = {sndprobe, sndattach, "sbmidi"};
@@ -116,8 +116,8 @@ struct isa_driver awedriver    = {sndprobe, sndattach, "awe"};
 struct isa_driver pasdriver = {sndprobe, sndattach, "pas"};
 struct isa_driver mpudriver = {sndprobe, sndattach, "mpu"};
 struct isa_driver gusdriver = {sndprobe, sndattach, "gus"};
-static struct isa_driver gusxvidriver = {sndprobe, sndattach, "gusxvi"};
-static struct isa_driver gusmaxdriver = {sndprobe, sndattach, "gusmax"};
+struct isa_driver gusxvidriver = {sndprobe, sndattach, "gusxvi"};
+struct isa_driver gusmaxdriver = {sndprobe, sndattach, "gusmax"};
 struct isa_driver uartdriver = {sndprobe, sndattach, "uart"};
 struct isa_driver mssdriver = {sndprobe, sndattach, "mss"};
 struct isa_driver cssdriver = {sndprobe, sndattach, "css"};