summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1997-12-28 13:36:09 +0000
committerphk <phk@FreeBSD.org>1997-12-28 13:36:09 +0000
commitca105236ff16f62ac2fdcdd9591281b1a4d2995f (patch)
tree6ef7a59affea2db05634530fff8d7f79080cf6d2 /sys/conf
parent2608f479cc82a1ffcbd0cec5334d4d4c24a9c0a7 (diff)
downloadFreeBSD-src-ca105236ff16f62ac2fdcdd9591281b1a4d2995f.zip
FreeBSD-src-ca105236ff16f62ac2fdcdd9591281b1a4d2995f.tar.gz
wash, sort and put in order various nits from the i586_ctr -> tsc
commit. Pointed out by: bde
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES6
-rw-r--r--sys/conf/options.i3864
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 5ee684f..5285f85 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.387 1997/12/26 20:41:05 phk Exp $
+# $Id: LINT,v 1.388 1997/12/28 00:28:46 jkh Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -1358,14 +1358,13 @@ options GATEWAY
options CLK_CALIBRATION_LOOP
options "CLK_USE_I8254_CALIBRATION"
-options "CLK_USE_TSC_CALIBRATION"
+options CLK_USE_TSC_CALIBRATION
options CLUSTERDEBUG
options COMPAT_LINUX
options CPU_UPGRADE_HW_CACHE
options DEBUG
options DEVFS_ROOT
options "EXT2FS"
-options "TSC_GUPROF"
options "I586_PMC_GUPROF=0x70000"
options "IBCS2"
options LOCKF_DEBUG
@@ -1406,3 +1405,4 @@ options SHMSEG=9
options SI_DEBUG
options SIMPLELOCK_DEBUG
options SPX_HACK
+options TSC_GUPROF
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 3569db5..2f2f7ac 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $Id: options.i386,v 1.64 1997/12/09 11:56:19 yokota Exp $
+# $Id: options.i386,v 1.65 1997/12/26 20:41:08 phk Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
@@ -24,8 +24,8 @@ COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
DSI_SOFT_MODEM opt_sio.h
EXTRA_SIO opt_sio.h
-TSC_GUPROF opt_i586_guprof.h
I586_PMC_GUPROF opt_i586_guprof.h
+TSC_GUPROF opt_i586_guprof.h
WLCACHE opt_wavelan.h
WLDEBUG opt_wavelan.h
OpenPOWER on IntegriCloud