aboutsummaryrefslogtreecommitdiff
path: root/sys/i386/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i386/conf')
-rw-r--r--sys/i386/conf/GENERIC6
-rw-r--r--sys/i386/conf/NOTES4
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 3fce0daa557b..f8ae817dacbe 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -29,7 +29,7 @@ ident GENERIC
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-options SCHED_ULE # ULE scheduler
+options SCHED_4BSD
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options FFS # Berkeley Fast Filesystem
@@ -239,8 +239,10 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
#device wl # Older non 802.11 Wavelan wireless NIC.
# Pseudo devices.
-device random # Entropy device
device loop # Network loopback
+device mem # Memory and kernel memory devices
+device null # Null and zero devices
+device random # Entropy device
device ether # Ethernet support
device sl # Kernel SLIP
device ppp # Kernel PPP
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index c1d05f5a98d6..6a6b4e6a3a73 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1053,3 +1053,7 @@ options TIMER_FREQ=((14318182+6)/12)
options VM_KMEM_SIZE
options VM_KMEM_SIZE_MAX
options VM_KMEM_SIZE_SCALE
+
+
+# The I/O device
+device io