summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2000-12-13 21:52:44 +0000
committerimp <imp@FreeBSD.org>2000-12-13 21:52:44 +0000
commit2d33459daf0cfd4e2c6ce4c36cbc6a80b5ede718 (patch)
treee918b5396b377dba5444b0a018f806bdf29e1b62
parent60e4cd30f51013ff13664acd24099480395a10de (diff)
downloadFreeBSD-src-2d33459daf0cfd4e2c6ce4c36cbc6a80b5ede718.zip
FreeBSD-src-2d33459daf0cfd4e2c6ce4c36cbc6a80b5ede718.tar.gz
o Remove the COMPAT_OLDPCI option now that Mike removed it.
o Add pmtimer device o Shorten scsi settle time to 1 second, since that's what I use and I'm tired of remerging it every time.
-rw-r--r--sys/i386/conf/NEWCARD6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD
index e73673c..06cc1b4 100644
--- a/sys/i386/conf/NEWCARD
+++ b/sys/i386/conf/NEWCARD
@@ -55,7 +55,7 @@ options CD9660_ROOT #CD-ROM usable as root, CD9660 required
#options DEVFS #Device Filesystem
options PROCFS #Process filesystem
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
-options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
+options SCSI_DELAY=1000 #Delay (in ms) before probing SCSI
options UCONSOLE #Allow users to grab the console
options USERCONFIG #boot -c editor
options VISUAL_USERCONFIG #visual boot -c editor
@@ -75,9 +75,9 @@ device isa
device eisa
device pci
device pccard
+device pmtimer
device cardbus
options COMPAT_OLDISA # compatability shims for lnc, le
-options COMPAT_OLDPCI # compatability shims for lnc
# Floppy drives
device fdc
@@ -209,7 +209,7 @@ device xe # Xircom pccard ethernet
# The probe order of these is presently determined by i386/isa/isa_compat.c.
device ie
device le
-device lnc
+#device lnc
# Wireless NIC cards
device an # Aironet 4500/4800 802.11 wireless NICs.
OpenPOWER on IntegriCloud