MFi386: bring over DEFAULTS (repocopy) and adapt. While there isn't a

4.x->6.x amd64 upgrade path, the config files are kept in approximate sync.
This commit is contained in:
Peter Wemm 2005-10-27 18:54:43 +00:00
parent 537b6cf3ea
commit 54903605b3
2 changed files with 3 additions and 9 deletions

View File

@ -1,17 +1,14 @@
#
# DEFAULTS -- Default kernel configuration file for FreeBSD/i386
# DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
#
# $FreeBSD$
# Not yet, this would break all existing configs
#machine i386
#machine amd64
# Bus support.
device isa
# Floating point support.
device npx
# Pseudo devices.
device mem # Memory and kernel memory devices
device io # I/O device

View File

@ -79,9 +79,8 @@ options SMP # Symmetric MultiProcessor Kernel
# 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
@ -231,8 +230,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