3 files changed, 3 insertions, 18 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index afe55f50a570..9270d568f951 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -70,9 +70,8 @@ device		atpic			# 8259A compatability
 # Linux 32-bit ABI support
 options 	LINPROCFS		# Cannot be a module yet.
 
-# Bus support.  Do not remove isa, even if you have no isa slots
+# Bus support.
 device		acpi
-device		isa
 device		pci
 
 # Floppy drives
@@ -222,8 +221,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
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 041bc86c547d..e5bb2c100395 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -65,8 +65,7 @@ options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 
 device		apic			# I/O APIC
 
-# Bus support.  Do not remove isa, even if you have no isa slots
-device		isa
+# Bus support.
 device		eisa
 device		pci
 
@@ -152,9 +151,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
 # Add suspend/resume support for the i8254.
@@ -239,8 +235,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
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 8307ef17487f..08b0097f4f4d 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
@@ -66,7 +65,7 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #device		apic			# I/O APIC
 
-device		isa
+# Bus support.
 device		pci
 
 # Floppy drives
@@ -116,9 +115,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
@@ -208,8 +204,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