aboutsummaryrefslogtreecommitdiff
path: root/sys/amd64
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2005-02-28 23:39:58 +0000
committerPeter Wemm <peter@FreeBSD.org>2005-02-28 23:39:58 +0000
commit8a7572e0e7d9a6b8846fe63de6afe702b147cd08 (patch)
tree03583790347802022b407137e3bd26012890468c /sys/amd64
parente73976812c3f3aa97bdfce4a4f5e515e29a16f91 (diff)
downloadsrc-8a7572e0e7d9a6b8846fe63de6afe702b147cd08.tar.gz
src-8a7572e0e7d9a6b8846fe63de6afe702b147cd08.zip
MFi386: Sync whitespace and an abbreviation
Notes
Notes: svn path=/head/; revision=142841
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/GENERIC8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 6850863bf972..0a2a5198484b 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -71,11 +71,11 @@ options WITNESS # Enable checks to detect deadlocks and cycles
options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
# Make an SMP-capable kernel by default
-options SMP # Symmetric MultiProcessor Kernel
+options SMP # Symmetric MultiProcessor Kernel
# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
-device atpic # 8259A compatability
-options NO_MIXED_MODE # Don't penalize working chipsets
+device atpic # 8259A compatability
+options NO_MIXED_MODE # Don't penalize working chipsets
# Bus support. Do not remove isa, even if you have no isa slots
device acpi
@@ -253,7 +253,7 @@ device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
device urio # Diamond Rio 500 MP3 player
device uscanner # Scanners
-# USB Ethernet, requires mii
+# USB Ethernet, requires miibus
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
device cue # CATC USB Ethernet