summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2002-06-19 13:47:53 +0000
committernyan <nyan@FreeBSD.org>2002-06-19 13:47:53 +0000
commit71120b685ab868328a4ca521ddb6f08f51b6c44e (patch)
treef52a5600648e7d3c83766d4bbd055f6deec0909d /sys
parentb7dd05aa7c6024d96ddc7083d8d56718e806e5ea (diff)
downloadFreeBSD-src-71120b685ab868328a4ca521ddb6f08f51b6c44e.zip
FreeBSD-src-71120b685ab868328a4ca521ddb6f08f51b6c44e.tar.gz
MFi386: revisions from 1.342 to 1.344
Diffstat (limited to 'sys')
-rw-r--r--sys/pc98/conf/GENERIC2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 2f670e0..1fb2806 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -64,6 +64,7 @@ options INVARIANTS #Enable calls of extra sanity checking
options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
options WITNESS #Enable checks to detect deadlocks and cycles
options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
+options ALT_BREAK_TO_DEBUGGER
# To make an SMP kernel, the next two are needed
#options SMP # Symmetric MultiProcessor Kernel
@@ -160,6 +161,7 @@ device ppi # Parallel port interface device
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
+device em # Intel PRO/1000 adapter Gigabit Ethernet Card
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')
OpenPOWER on IntegriCloud