PERFORCE change 48111 for review

[Peter Wemm]

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

Change 48111 by peter at 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