diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2005-10-27 17:34:35 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2005-10-27 17:34:35 +0000 |
| commit | 85d72e4a2ec5575f169dacf5b1745fd318fdfc83 (patch) | |
| tree | fc1803826bab50ecc665e6f9ecf346114cc9184f /sys/i386 | |
| parent | 5d89e1d0af780267751125a258f03f6be8962ebc (diff) | |
Notes
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/DEFAULTS | 17 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 8 |
2 files changed, 18 insertions, 7 deletions
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS new file mode 100644 index 0000000000000..60cb04a5e9797 --- /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 3cae1ffbb5886..08585e6368cd2 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 |