aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew N. Dodd <mdodd@FreeBSD.org>2003-03-29 09:59:49 +0000
committerMatthew N. Dodd <mdodd@FreeBSD.org>2003-03-29 09:59:49 +0000
commita71a30738355470bd3d3948cab66c107cb979874 (patch)
tree737a206949ea55349b746853e81b4265aba9e287
parent14b2046d29720f5b1711a74780447838f6f5c6b7 (diff)
Retire 'atspeaker' and 'pcspeaker'. We'll use 'speaker' which
is the same as the config device directive. Reminded by: Takahashi Yoshihiro <nyan@jp.FreeBSD.org>
Notes
Notes: svn path=/head/; revision=112784
-rw-r--r--sys/modules/Makefile3
-rw-r--r--sys/modules/pcspeaker/Makefile9
-rw-r--r--sys/modules/speaker/Makefile (renamed from sys/modules/atspeaker/Makefile)0
3 files changed, 1 insertions, 11 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 80eb5c22dc8f..da82a4e29bbe 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -188,6 +188,7 @@ SUBDIR+=3dfx \
scsi_low \
smbfs \
sound \
+ speaker \
splash \
sppp \
sr \
@@ -201,7 +202,6 @@ SUBDIR+=3dfx \
SUBDIR+=aac \
acpi \
asr \
- atspeaker \
cardbus \
cbb \
ciss \
@@ -217,7 +217,6 @@ SUBDIR+=aac \
.elif ${MACHINE} == "pc98"
SUBDIR+=canbepm \
canbus \
- pcspeaker \
pmc \
snc
.endif
diff --git a/sys/modules/pcspeaker/Makefile b/sys/modules/pcspeaker/Makefile
deleted file mode 100644
index ff0f64f7a8da..000000000000
--- a/sys/modules/pcspeaker/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../pc98/pc98
-
-KMOD= pcspeaker
-SRCS= spkr.c
-SRCS+= bus_if.h device_if.h isa_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/atspeaker/Makefile b/sys/modules/speaker/Makefile
index 88963daf424f..88963daf424f 100644
--- a/sys/modules/atspeaker/Makefile
+++ b/sys/modules/speaker/Makefile