summaryrefslogtreecommitdiffstats
path: root/sys/amd64/conf
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2004-08-16 22:59:24 +0000
committerpeter <peter@FreeBSD.org>2004-08-16 22:59:24 +0000
commit2bd0b02c86d4103a762d65535a44a0d0e62d40aa (patch)
treef297b183d14ac6cd3271900f827272ea8666546e /sys/amd64/conf
parent7f3727c1dab57fe4a5ee9386c4c96a38c3fe1f53 (diff)
downloadFreeBSD-src-2bd0b02c86d4103a762d65535a44a0d0e62d40aa.zip
FreeBSD-src-2bd0b02c86d4103a762d65535a44a0d0e62d40aa.tar.gz
Sync with i386 - add ADAPTIVE_GIANT, remove pcic
Diffstat (limited to 'sys/amd64/conf')
-rw-r--r--sys/amd64/conf/GENERIC2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index fdeb6d5..f5c33c6 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -58,6 +58,7 @@ options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~215k to driver.
options PFIL_HOOKS # pfil(9) framework
+options ADAPTIVE_GIANT # Giant mutex is adaptive.
# Debugging for use in -current
options KDB # Enable kernel debugger support.
@@ -149,7 +150,6 @@ device sc
# PCCARD (PCMCIA) support
# PCMCIA and cardbus bridge support
device cbb # cardbus (yenta) bridge
-#device pcic # ExCA ISA and PCI bridges
device pccard # PC Card (16-bit) bus
device cardbus # CardBus (32-bit) bus
OpenPOWER on IntegriCloud