2 files changed, 19 insertions, 7 deletions

diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS
new file mode 100644
index 0000000000000..bb0dab4a11ca4
--- /dev/null
+++ b/sys/pc98/conf/DEFAULTS
@@ -0,0 +1,18 @@
+#
+# DEFAULTS -- Default kernel configuration file for FreeBSD/pc98
+#
+# $FreeBSD$
+
+# Not yet, this would break all existing configs
+#machine		pc98 i386
+options 	PC98
+
+# Bus support.
+device		isa
+
+# Floating point support.
+device		npx
+
+# Pseudo devices.
+device		mem		# Memory and kernel memory devices
+device		io		# I/O device
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 950ed0c17c03d..ffdc052b79c3b 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -29,7 +29,6 @@ ident		GENERIC
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
-options 	PC98			# PC98
 #options 	SCHED_ULE		# ULE scheduler
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
@@ -75,7 +74,7 @@ options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #device		apic			# I/O APIC
 
-device		isa
+# Bus support.
 device		pci
 
 # Floppy drives
@@ -125,9 +124,6 @@ device		sc
 
 #device		agp		# support several AGP chipsets
 
-# Floating point support - do not disable.
-device		npx
-
 # Power management support (see NOTES for more options)
 #device		apm
 #device		pmc
@@ -217,8 +213,6 @@ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		mem		# Memory and kernel memory devices
-device		io		# I/O device
 device		random		# Entropy device
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP