aboutsummaryrefslogtreecommitdiff
path: root/sys/conf/options.i386
diff options
context:
space:
mode:
Diffstat (limited to 'sys/conf/options.i386')
-rw-r--r--sys/conf/options.i38613
1 files changed, 10 insertions, 3 deletions
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 37b112e1e6e9..c577568c837f 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Options specific to the i386 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
@@ -10,7 +9,6 @@ DISABLE_PG_G opt_pmap.h
DISABLE_PSE opt_pmap.h
MAXMEM
MPTABLE_FORCE_HTT
-MP_WATCHDOG
NKPT opt_pmap.h
PERFMON
PMAP_SHPGPERPROC opt_pmap.h
@@ -99,9 +97,18 @@ NPX_DEBUG opt_npx.h
BPF_JITTER opt_bpf.h
# Hyper-V support
-HYPERV opt_hyperv.h
+DEV_HYPERV opt_hyperv.h
XENHVM opt_global.h
# options for the Intel C600 SAS driver (isci)
ISCI_LOGGING opt_isci.h
+
+# Don't create a "legacy" PCI bridge if none is found.
+NO_LEGACY_PCIB opt_cpu.h
+
+# Compatibility with Linux MP table bugs.
+MPTABLE_LINUX_BUG_COMPAT
+
+# x86 specific uart options
+UART_NS8250_EARLY_PORT opt_uart.h