From a71a30738355470bd3d3948cab66c107cb979874 Mon Sep 17 00:00:00 2001 From: "Matthew N. Dodd" Date: Sat, 29 Mar 2003 09:59:49 +0000 Subject: [PATCH] Retire 'atspeaker' and 'pcspeaker'. We'll use 'speaker' which is the same as the config device directive. Reminded by: Takahashi Yoshihiro --- sys/modules/Makefile | 3 +-- sys/modules/pcspeaker/Makefile | 9 --------- sys/modules/{atspeaker => speaker}/Makefile | 0 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 sys/modules/pcspeaker/Makefile rename sys/modules/{atspeaker => speaker}/Makefile (100%) 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 diff --git a/sys/modules/atspeaker/Makefile b/sys/modules/speaker/Makefile similarity index 100% rename from sys/modules/atspeaker/Makefile rename to sys/modules/speaker/Makefile