23 files changed, 9 insertions, 161 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 77ca00bd4e7c..8a832b9a3588 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -599,7 +599,7 @@ _vxge=  	vxge
 _wbwd=		wbwd
 _wi=		wi
 _xe=		xe
-.if ${MACHINE} != "pc98"
+
 _aac=		aac
 _aacraid=	aacraid
 _acpi=		acpi
@@ -680,7 +680,6 @@ _wpifw=		wpifw
 .endif
 _x86bios=	x86bios
 .endif
-.endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 _efirt=		efirt
@@ -730,7 +729,6 @@ _sbni=		sbni
 _streams=	streams
 _stg=		stg
 _svr4=		svr4
-.if ${MACHINE} == "i386"
 .if ${MK_EISA} != "no"
 _ahb=		ahb
 .endif
@@ -740,13 +738,6 @@ _ctau=		ctau
 .endif
 _dpt=		dpt
 _ex=		ex
-.elif ${MACHINE} == "pc98"
-_canbepm=	canbepm
-_canbus=	canbus
-_ct=		ct
-_pmc=		pmc
-_snc=		snc
-.endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "arm"
diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc
index b20b99b7a75c..a81b6b1edc37 100644
--- a/sys/modules/Makefile.inc
+++ b/sys/modules/Makefile.inc
@@ -1,7 +1,3 @@
 # $FreeBSD$
 
-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 SUBDIR_PARALLEL=	yes
diff --git a/sys/modules/aic/Makefile b/sys/modules/aic/Makefile
index 860d9a8a9499..4c0277f86eb0 100644
--- a/sys/modules/aic/Makefile
+++ b/sys/modules/aic/Makefile
@@ -3,14 +3,8 @@
 .PATH: ${.CURDIR}/../../dev/aic
 
 KMOD=	aic
-SRCS=	aic.c aic_pccard.c
+SRCS=	aic.c aic_isa.c aic_pccard.c
 SRCS+=	device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
 SRCS+=	opt_cam.h opt_scsi.h
 
-.if ${MACHINE} == "pc98"
-SRCS+=	aic_cbus.c
-.else
-SRCS+=	aic_isa.c
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/apm/Makefile b/sys/modules/apm/Makefile
index 96703b15fab6..d7be22d65982 100644
--- a/sys/modules/apm/Makefile
+++ b/sys/modules/apm/Makefile
@@ -1,15 +1,9 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../i386/bios
-.if ${MACHINE} == "pc98"
-.PATH: ${.CURDIR}/../../pc98/apm
-.endif
 
 KMOD=	apm
 SRCS=	apm.c apm.h
-.if ${MACHINE} == "pc98"
-SRCS+=	apm_bioscall.S
-.endif
 SRCS+=	device_if.h bus_if.h
 
 EXPORT_SYMS=	apm_display	\
diff --git a/sys/modules/ata/Makefile b/sys/modules/ata/Makefile
index c14fb8c2ccd5..21d853325824 100644
--- a/sys/modules/ata/Makefile
+++ b/sys/modules/ata/Makefile
@@ -2,11 +2,7 @@
 
 SUBDIR = atacore
 SUBDIR += atacard
-.if ${MACHINE} == "pc98"
-SUBDIR += atacbus
-.else
 SUBDIR += ataisa
-.endif
 SUBDIR += atapci 
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/canbepm/Makefile b/sys/modules/canbepm/Makefile
deleted file mode 100644
index 0eb911243eee..000000000000
--- a/sys/modules/canbepm/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../pc98/pc98
-KMOD	= canbepm
-SRCS	= canbepm.c
-SRCS	+= device_if.h bus_if.h canbus_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/canbus/Makefile b/sys/modules/canbus/Makefile
deleted file mode 100644
index 19487e01ef3d..000000000000
--- a/sys/modules/canbus/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../pc98/pc98
-KMOD	= canbus
-SRCS	= canbus.c
-SRCS	+= device_if.h bus_if.h canbus_if.h canbus_if.c
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ct/Makefile b/sys/modules/ct/Makefile
deleted file mode 100644
index 91cb936dbb4a..000000000000
--- a/sys/modules/ct/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/ct
-
-KMOD=	ct
-SRCS=	bshw_machdep.c ct.c ct_isa.c
-SRCS+=	device_if.h bus_if.h isa_if.h 
-SRCS+=	opt_ct.h opt_cam.h opt_scsi.h opt_ddb.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/drm2/Makefile b/sys/modules/drm2/Makefile
index 6ba0def9597e..52fc3e241ff1 100644
--- a/sys/modules/drm2/Makefile
+++ b/sys/modules/drm2/Makefile
@@ -3,7 +3,7 @@
 SYSDIR?=${.CURDIR}/../..
 .include "${SYSDIR}/conf/kern.opts.mk"
 
-.if ${MACHINE_CPUARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 _i915kms=	i915kms
 _radeonkms=	radeonkms
 . if ${MK_SOURCELESS_UCODE} != "no"
@@ -11,16 +11,6 @@ _radeonkmsfw=	radeonkmsfw
 . endif
 .endif
 
-.if ${MACHINE_CPUARCH} == "i386"
-. if ${MACHINE} != "pc98"
-_i915kms=	i915kms
-_radeonkms=	radeonkms
-.  if ${MK_SOURCELESS_UCODE} != "no"
-_radeonkmsfw=	radeonkmsfw
-.  endif
-. endif
-.endif
-
 .if ${MACHINE_CPUARCH} == "powerpc"
 _radeonkms=	radeonkms
 . if ${MK_SOURCELESS_UCODE} != "no"
diff --git a/sys/modules/ed/Makefile b/sys/modules/ed/Makefile
index 427b99f973cd..a6a74b16470c 100644
--- a/sys/modules/ed/Makefile
+++ b/sys/modules/ed/Makefile
@@ -5,14 +5,10 @@
 KMOD=	if_ed
 SRCS=	if_ed.c
 SRCS+=	if_ed_novell.c if_ed_wd80x3.c if_ed_rtl80x9.c isa_if.h
-.if ${MACHINE} == "pc98"
-SRCS+=	if_ed_cbus.c
-.else
 SRCS+=	if_ed_isa.c
 SRCS.ED_HPP=if_ed_hpp.c
 SRCS.ED_SIC=if_ed_sic.c
 SRCS.ED_3C503=if_ed_3c503.c
-.endif
 SRCS+=	if_ed_pccard.c pccarddevs.h card_if.h
 SRCS.DEV_PCI=if_ed_pci.c pci_if.h
 
diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile
index 40eb42719379..b19f204aacd0 100644
--- a/sys/modules/fdc/Makefile
+++ b/sys/modules/fdc/Makefile
@@ -3,14 +3,10 @@
 KMOD=	fdc
 
 .PATH:  ${.CURDIR}/../../dev/fdc
-.if ${MACHINE} == "pc98"
-SRCS=	fdc.c fdc_cbus.c
-.else
 SRCS=	fdc.c fdc_isa.c fdc_pccard.c
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
 SRCS+=	opt_acpi.h acpi_if.h fdc_acpi.c
 .endif
-.endif
 
 SRCS+=	opt_fdc.h bus_if.h card_if.h device_if.h \
 	isa_if.h pccarddevs.h
diff --git a/sys/modules/fe/Makefile b/sys/modules/fe/Makefile
index 77af85bfd63b..81a7e12905e0 100644
--- a/sys/modules/fe/Makefile
+++ b/sys/modules/fe/Makefile
@@ -3,13 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/fe
 
 KMOD=	if_fe
-SRCS=	if_fe.c if_fe_pccard.c
-
-.if ${MACHINE} == "pc98"
-SRCS+=	if_fe_cbus.c
-.else
-SRCS+=	if_fe_isa.c
-.endif
+SRCS=	if_fe.c if_fe_isa.c if_fe_pccard.c
 
 SRCS+=	bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h
 
diff --git a/sys/modules/geom/geom_part/Makefile b/sys/modules/geom/geom_part/Makefile
index aa6059c3ba82..a83ef624db78 100644
--- a/sys/modules/geom/geom_part/Makefile
+++ b/sys/modules/geom/geom_part/Makefile
@@ -7,7 +7,6 @@ SUBDIR=	geom_part_apm \
 	geom_part_gpt \
 	geom_part_ldm \
 	geom_part_mbr \
-	geom_part_pc98 \
 	geom_part_vtoc8
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/geom/geom_part/geom_part_pc98/Makefile b/sys/modules/geom/geom_part/geom_part_pc98/Makefile
deleted file mode 100644
index 283809f3d6b3..000000000000
--- a/sys/modules/geom/geom_part/geom_part_pc98/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../../geom/part
-
-KMOD=	geom_part_pc98
-SRCS=	g_part_pc98.c
-
-SRCS+=	bus_if.h device_if.h g_part_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_pc98/Makefile b/sys/modules/geom/geom_pc98/Makefile
deleted file mode 100644
index 2c5952d3e4f0..000000000000
--- a/sys/modules/geom/geom_pc98/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../geom
-
-KMOD=	geom_pc98
-SRCS=	geom_pc98.c geom_pc98_enc.c
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/controllers/Makefile b/sys/modules/i2c/controllers/Makefile
index 132ff2d3babe..d4e8296ba960 100644
--- a/sys/modules/i2c/controllers/Makefile
+++ b/sys/modules/i2c/controllers/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-.if ${MACHINE} == "pc98"
-SUBDIR = lpbb
-.else
 SUBDIR = alpm amdpm amdsmb ichiic ichsmb intpm ismt nfsmb viapm lpbb pcf
-.endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/le/Makefile b/sys/modules/le/Makefile
index d267cbec2c26..4880af1d2caa 100644
--- a/sys/modules/le/Makefile
+++ b/sys/modules/le/Makefile
@@ -3,16 +3,12 @@
 .PATH: ${.CURDIR}/../../dev/le
 
 KMOD=	if_le
-SRCS=	am7990.c am79900.c ${if_le_cbus} ${if_le_isa} ${if_le_lebuffer}
+SRCS=	am7990.c am79900.c ${if_le_isa} ${if_le_lebuffer}
 SRCS+=	${if_le_ledma} if_le_pci.c lance.c ${lebuffer_sbus}
 SRCS+=	bus_if.h device_if.h ${isa_if} ${ofw_bus_if} pci_if.h
 
 .if ${MACHINE_CPUARCH} == "i386"
-.if ${MACHINE} == "pc98"
-if_le_cbus=	if_le_cbus.c
-.else
 if_le_isa=	if_le_isa.c
-.endif
 isa_if=		isa_if.h
 .endif
 
diff --git a/sys/modules/mse/Makefile b/sys/modules/mse/Makefile
index 4cc68c1f9c6d..af515b2e80b9 100644
--- a/sys/modules/mse/Makefile
+++ b/sys/modules/mse/Makefile
@@ -3,12 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/mse
 
 KMOD=	mse
-SRCS=	mse.c device_if.h bus_if.h isa_if.h
-
-.if (${MACHINE} == "pc98")
-SRCS+= mse_cbus.c
-.else
-SRCS+= mse_isa.c
-.endif
+SRCS=	mse.c mse_isa.c device_if.h bus_if.h isa_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/pmc/Makefile b/sys/modules/pmc/Makefile
deleted file mode 100644
index 60dd3503dfcd..000000000000
--- a/sys/modules/pmc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../pc98/cbus
-
-KMOD=	pmc
-SRCS=	pmc.c
-SRCS+=	bus_if.h device_if.h isa_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ppc/Makefile b/sys/modules/ppc/Makefile
index 53621f119baa..76323b4cd065 100644
--- a/sys/modules/ppc/Makefile
+++ b/sys/modules/ppc/Makefile
@@ -6,15 +6,8 @@ SRCS=	bus_if.h device_if.h ppbus_if.h isa_if.h pci_if.h serdev_if.h \
 	opt_ppc.h opt_isa.h \
 	ppc.c ppc_pci.c ppc_puc.c
 
-.if ${MACHINE_CPUARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 SRCS+=	ppc_acpi.c ppc_isa.c
 .endif
 
-.if ${MACHINE_CPUARCH} == "i386"
-.if ${MACHINE} != "pc98"
-SRCS+=	ppc_acpi.c
-.endif
-SRCS+=	ppc_isa.c
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sio/Makefile b/sys/modules/sio/Makefile
index 057e9c614d42..9e162807b66a 100644
--- a/sys/modules/sio/Makefile
+++ b/sys/modules/sio/Makefile
@@ -1,29 +1,15 @@
 # $FreeBSD$
 
-.if ${MACHINE} == "pc98"
-.PATH: ${.CURDIR}/../../pc98/cbus
-.endif
 .PATH: ${.CURDIR}/../../dev/sio
 
 KMOD=	sio
 SRCS=	bus_if.h card_if.h device_if.h isa_if.h pci_if.h serdev_if.h \
 	opt_compat.h opt_gdb.h opt_kdb.h opt_sio.h \
-	sio.c sio_pccard.c sio_pci.c sio_puc.c pccarddevs.h
-.if ${MACHINE} == "pc98"
-SRCS+=	sio_cbus.c
-.else
-SRCS+=	sio_isa.c
-.endif
+	sio.c sio_isa.c sio_pccard.c sio_pci.c sio_puc.c pccarddevs.h
 
 .if !defined(KERNBUILDDIR)
 opt_compat.h:
 	echo "#define COMPAT_43 1" > ${.TARGET}
-
-.if ${MACHINE} == "pc98"
-opt_sio.h:
-	echo "#define COM_MULTIPORT 1" > ${.TARGET}
-	echo "#define COM_ESP 1" >> ${.TARGET}
-.endif
 .endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/snc/Makefile b/sys/modules/snc/Makefile
deleted file mode 100644
index 837248609c87..000000000000
--- a/sys/modules/snc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/snc
-
-KMOD=	if_snc
-SRCS=	if_snc.c if_snc_cbus.c if_snc_pccard.c dp83932.c dp83932subr.c
-SRCS+=	opt_inet.h device_if.h bus_if.h isa_if.h card_if.h pccarddevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile
index ff9c48e66f7e..274d25f69170 100644
--- a/sys/modules/sound/sound/Makefile
+++ b/sys/modules/sound/sound/Makefile
@@ -34,8 +34,7 @@ CLEANFILES+=	feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h
 
 EXPORT_SYMS=	YES	# XXX evaluate
 
-.if ${MACHINE_CPUARCH} != "i386" && ${MACHINE_CPUARCH} != "amd64" && \
-    ${MACHINE_CPUARCH} != "pc98"
+.if ${MACHINE_CPUARCH} != "i386" && ${MACHINE_CPUARCH} != "amd64"
 # Create an empty opt_isa.h in order to keep kmod.mk from linking in an
 # existing one from KERNBUILDDIR which possibly has DEV_ISA defined so
 # sound.ko is always built without isadma support.