summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1999-03-10 14:01:59 +0000
committerkato <kato@FreeBSD.org>1999-03-10 14:01:59 +0000
commita6d7ece439329c07c5afe4c93f8be48bb3b4e775 (patch)
treec0ca2daba4cc9235d71d59ce28c95fff1a080b17
parent610e06fcb60a0a042c2b781edd6aaf281de9c101 (diff)
downloadFreeBSD-src-a6d7ece439329c07c5afe4c93f8be48bb3b4e775.zip
FreeBSD-src-a6d7ece439329c07c5afe4c93f8be48bb3b4e775.tar.gz
Sync with sys/i386/conf/options.i386 revision up to 1.108.
-rw-r--r--sys/conf/options.pc9811
-rw-r--r--sys/pc98/conf/options.pc9811
2 files changed, 20 insertions, 2 deletions
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 51fd0d3..c4f31b6 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.79 1999/02/16 11:12:42 kato Exp $
+# $Id: options.pc98,v 1.80 1999/03/03 10:40:27 kato Exp $
DISABLE_PSE
IDE_DELAY
@@ -41,6 +41,7 @@ NINTR opt_smp.h
CLK_CALIBRATION_LOOP opt_clock.h
CLK_USE_I8254_CALIBRATION opt_clock.h
CLK_USE_TSC_CALIBRATION opt_clock.h
+TIMER_FREQ opt_clock.h
NO_F00F_HACK opt_cpu.h
CPU_BLUELIGHTNING_FPU_OP_CACHE opt_cpu.h
@@ -151,6 +152,7 @@ ELSA_QS1ISA opt_i4b.h
# isdn4bsd: passive PCI cards
# -------------------------------
ELSA_QS1PCI opt_i4b.h
+AVM_A1_PCI opt_i4b.h
# -------------------------------
# isdn4bsd: passive PCMCIA cards
# -------------------------------
@@ -163,6 +165,13 @@ I4B_SMP_WORKAROUND opt_i4b.h
# enable VJ compression code for ipr i/f
IPR_VJ opt_i4b.h
# -------------------------------
+# oltr: build options
+# -------------------------------
+# Exclude microcode options
+OLTR_NO_TMS_MAC opt_oltr.h
+OLTR_NO_HAWKEYE_MAC opt_oltr.h
+OLTR_NO_BULLSEYE_MAC opt_oltr.h
+# -------------------------------
# EOF
# -------------------------------
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index 51fd0d3..c4f31b6 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.79 1999/02/16 11:12:42 kato Exp $
+# $Id: options.pc98,v 1.80 1999/03/03 10:40:27 kato Exp $
DISABLE_PSE
IDE_DELAY
@@ -41,6 +41,7 @@ NINTR opt_smp.h
CLK_CALIBRATION_LOOP opt_clock.h
CLK_USE_I8254_CALIBRATION opt_clock.h
CLK_USE_TSC_CALIBRATION opt_clock.h
+TIMER_FREQ opt_clock.h
NO_F00F_HACK opt_cpu.h
CPU_BLUELIGHTNING_FPU_OP_CACHE opt_cpu.h
@@ -151,6 +152,7 @@ ELSA_QS1ISA opt_i4b.h
# isdn4bsd: passive PCI cards
# -------------------------------
ELSA_QS1PCI opt_i4b.h
+AVM_A1_PCI opt_i4b.h
# -------------------------------
# isdn4bsd: passive PCMCIA cards
# -------------------------------
@@ -163,6 +165,13 @@ I4B_SMP_WORKAROUND opt_i4b.h
# enable VJ compression code for ipr i/f
IPR_VJ opt_i4b.h
# -------------------------------
+# oltr: build options
+# -------------------------------
+# Exclude microcode options
+OLTR_NO_TMS_MAC opt_oltr.h
+OLTR_NO_HAWKEYE_MAC opt_oltr.h
+OLTR_NO_BULLSEYE_MAC opt_oltr.h
+# -------------------------------
# EOF
# -------------------------------
OpenPOWER on IntegriCloud