summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorcg <cg@FreeBSD.org>2000-11-01 00:53:16 +0000
committercg <cg@FreeBSD.org>2000-11-01 00:53:16 +0000
commita7f52826c11e73cb6c8971f2b03a7593bb7bee3f (patch)
tree5e1b1b78984a0b7bc30c8e2b7a8538103587d244 /sys
parent0e1561470aa1da0df38b8676aee7e1976e3802ff (diff)
downloadFreeBSD-src-a7f52826c11e73cb6c8971f2b03a7593bb7bee3f.zip
FreeBSD-src-a7f52826c11e73cb6c8971f2b03a7593bb7bee3f.tar.gz
switch over to new sb8/sb16 code
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files5
-rw-r--r--sys/dev/sound/driver.c5
-rw-r--r--sys/modules/sound/driver/Makefile2
3 files changed, 5 insertions, 7 deletions
diff --git a/sys/conf/files b/sys/conf/files
index dc29993..a9e93bd 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -437,9 +437,8 @@ dev/sound/isa/gusmidi.c optional midi isa
dev/sound/isa/mpu.c optional midi isa
dev/sound/isa/mss.c optional pcm isa
dev/sound/isa/opl.c optional midi isa
-#dev/sound/isa/sb16.c optional pcm isa
-#dev/sound/isa/sb8.c optional pcm isa
-dev/sound/isa/sb.c optional pcm isa
+dev/sound/isa/sb16.c optional pcm isa
+dev/sound/isa/sb8.c optional pcm isa
dev/sound/isa/sbc.c optional pcm isa
dev/sound/isa/sbc.c optional sbc isa
dev/sound/isa/uartsio.c optional midi isa
diff --git a/sys/dev/sound/driver.c b/sys/dev/sound/driver.c
index 0005dac..70f50f5 100644
--- a/sys/dev/sound/driver.c
+++ b/sys/dev/sound/driver.c
@@ -64,9 +64,8 @@ MODULE_DEPEND(snd_driver, snd_gusc, 1, 1, 1);
MODULE_DEPEND(snd_driver, snd_maestro, 1, 1, 1);
MODULE_DEPEND(snd_driver, snd_mss, 1, 1, 1);
MODULE_DEPEND(snd_driver, snd_neomagic, 1, 1, 1);
-MODULE_DEPEND(snd_driver, snd_sb, 1, 1, 1);
-/* MODULE_DEPEND(snd_driver, snd_sb8, 1, 1, 1); */
-/* MODULE_DEPEND(snd_driver, snd_sb16, 1, 1, 1); */
+MODULE_DEPEND(snd_driver, snd_sb8, 1, 1, 1);
+MODULE_DEPEND(snd_driver, snd_sb16, 1, 1, 1);
MODULE_DEPEND(snd_driver, snd_sbc, 1, 1, 1);
MODULE_DEPEND(snd_driver, snd_solo, 1, 1, 1);
MODULE_DEPEND(snd_driver, snd_t4dwave, 1, 1, 1);
diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile
index 89efc16..888cfb7 100644
--- a/sys/modules/sound/driver/Makefile
+++ b/sys/modules/sound/driver/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
SUBDIR = ad1816 csa csapcm ds1 emu10k1 es137x es1888 ess fm801 gusc
-SUBDIR += maestro mss neomagic sb sbc solo t4dwave via82c686
+SUBDIR += maestro mss neomagic sb16 sb8 sbc solo t4dwave via82c686
SUBDIR += driver
.include <bsd.subdir.mk>
OpenPOWER on IntegriCloud