summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2002-10-31 05:19:33 +0000
committernyan <nyan@FreeBSD.org>2002-10-31 05:19:33 +0000
commitdce1b55ab1023105165c2a6f27ebcd9813a21198 (patch)
tree40c57c460d8a39f46ff3f48d0ed7c33cd579d90c
parent20faf7952929ef257a18ac1e9e2582678f602ce4 (diff)
downloadFreeBSD-src-dce1b55ab1023105165c2a6f27ebcd9813a21198.zip
FreeBSD-src-dce1b55ab1023105165c2a6f27ebcd9813a21198.tar.gz
Rename the speaker device for pc98 to 'pcspeaker'.
-rw-r--r--sys/modules/Makefile2
-rw-r--r--sys/modules/atspeaker/Makefile5
-rw-r--r--sys/modules/pcspeaker/Makefile11
3 files changed, 12 insertions, 6 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index da7800e..e2d7072 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -211,7 +211,6 @@ SUBDIR+=aic \
apm \
ar \
arcnet \
- atspeaker \
bktr \
coff \
em \
@@ -230,6 +229,7 @@ SUBDIR+=aic \
nsp \
oltr \
pccard \
+ pcspeaker \
pecoff \
pmc \
ray \
diff --git a/sys/modules/atspeaker/Makefile b/sys/modules/atspeaker/Makefile
index 6cb6002..88963da 100644
--- a/sys/modules/atspeaker/Makefile
+++ b/sys/modules/atspeaker/Makefile
@@ -1,11 +1,6 @@
# $FreeBSD$
-.if ${MACHINE} == "pc98"
-.PATH: ${.CURDIR}/../../pc98/pc98
-CFLAGS+= -DPC98
-.else
.PATH: ${.CURDIR}/../../i386/isa
-.endif
KMOD= atspeaker
SRCS= spkr.c
diff --git a/sys/modules/pcspeaker/Makefile b/sys/modules/pcspeaker/Makefile
new file mode 100644
index 0000000..7f50c85
--- /dev/null
+++ b/sys/modules/pcspeaker/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../pc98/pc98
+
+KMOD= pcspeaker
+SRCS= spkr.c
+SRCS+= bus_if.h device_if.h isa_if.h
+
+CFLAGS+= -DPC98
+
+.include <bsd.kmod.mk>
OpenPOWER on IntegriCloud