summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2003-11-03 22:45:54 +0000
committerjhb <jhb@FreeBSD.org>2003-11-03 22:45:54 +0000
commit0ca760bba8e0e2b56a03404d8849880674832462 (patch)
tree221b45d85943226aa39885c983d358d07933e7cc
parent7592e4e21aba4280b85a38ae2196b0973ca67dbf (diff)
downloadFreeBSD-src-0ca760bba8e0e2b56a03404d8849880674832462.zip
FreeBSD-src-0ca760bba8e0e2b56a03404d8849880674832462.tar.gz
- Remove APIC_IO option.
- Add NO_MIXED_MODE, DEV_ACPI, and DEV_APIC options.
-rw-r--r--sys/conf/options.i3865
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 91f22d6..b5788d7 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -7,6 +7,7 @@ BROKEN_KEYBOARD_RESET opt_reset.h
COMPAT_OLDISA
I586_PMC_GUPROF opt_i586_guprof.h
MAXMEM
+NO_MIXED_MODE
PERFMON
DISABLE_PSE opt_pmap.h
DISABLE_PG_G opt_pmap.h
@@ -25,8 +26,6 @@ COMPAT_SVR4 opt_dontuse.h
DEBUG_SVR4 opt_svr4.h
PECOFF_SUPPORT opt_dontuse.h
PECOFF_DEBUG opt_pecoff.h
-# i386 SMP options
-APIC_IO opt_global.h
# Change KVM size. Changes things all over the kernel.
KVA_PAGES opt_global.h
@@ -147,6 +146,8 @@ IPR_VJ opt_i4b.h
IPR_LOG opt_i4b.h
# Device options
+DEV_ACPI opt_acpi.h
+DEV_APIC opt_apic.h
DEV_NPX opt_npx.h
# -------------------------------
OpenPOWER on IntegriCloud