From owner-p4-projects@FreeBSD.ORG  Wed Mar  3 22:12:20 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 24D8216A4D0; Wed,  3 Mar 2004 22:12:20 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F1E9216A4CE
	for <perforce@freebsd.org>; Wed,  3 Mar 2004 22:12:19 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ECDBF43D1F
	for <perforce@freebsd.org>; Wed,  3 Mar 2004 22:12:19 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i246CJGe015802
	for <perforce@freebsd.org>; Wed, 3 Mar 2004 22:12:19 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i246CJpV015796
	for perforce@freebsd.org; Wed, 3 Mar 2004 22:12:19 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Wed, 3 Mar 2004 22:12:19 -0800 (PST)
Message-Id: <200403040612.i246CJpV015796@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 48111 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Mar 2004 06:12:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=48111

Change 48111 by peter@peter_daintree on 2004/03/03 22:12:05

	fix some text merge problems

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/NOTES#6 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/NOTES#6 (text+ko) ====

@@ -107,9 +107,8 @@
 # calibration to be repeated.)
 options 	CLK_CALIBRATION_LOOP
 
-# The following two options measure the frequency of the corresponding
-# clock relative to the RTC (onboard mc146818a).
-
+# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254
+# clock to actually be used.
 options 	CLK_USE_I8254_CALIBRATION