From 85d72e4a2ec5575f169dacf5b1745fd318fdfc83 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 27 Oct 2005 17:34:35 +0000
Subject: [PATCH] Create a default kernel config for i386 and move 'device isa'
 and 'device npx' (both of which aren't really optional right now) and 'device
 io' and 'device mem' (to preserve POLA for 4.x users upgrading to 6.0) from
 GENERIC into DEFAULTS.

Requested by:	scottl
Reviewed by:	scottl
---
 sys/amd64/conf/DEFAULTS | 17 +++++++++++++++++
 sys/i386/conf/DEFAULTS  | 17 +++++++++++++++++
 sys/i386/conf/GENERIC   |  8 +-------
 3 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 sys/amd64/conf/DEFAULTS
 create mode 100644 sys/i386/conf/DEFAULTS

diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
new file mode 100644
index 000000000000..60cb04a5e979
--- /dev/null
+++ b/sys/amd64/conf/DEFAULTS
@@ -0,0 +1,17 @@
+#
+# DEFAULTS -- Default kernel configuration file for FreeBSD/i386
+#
+# $FreeBSD$
+
+# Not yet, this would break all existing configs
+#machine		i386
+
+# 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/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS
new file mode 100644
index 000000000000..60cb04a5e979
--- /dev/null
+++ b/sys/i386/conf/DEFAULTS
@@ -0,0 +1,17 @@
+#
+# DEFAULTS -- Default kernel configuration file for FreeBSD/i386
+#
+# $FreeBSD$
+
+# Not yet, this would break all existing configs
+#machine		i386
+
+# 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/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 3cae1ffbb588..08585e6368cd 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -76,8 +76,7 @@ options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 options 	SMP			# Symmetric MultiProcessor Kernel
 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
 
@@ -163,9 +162,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.
@@ -250,8 +246,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