PERFORCE change 48920 for review

[Peter Wemm]

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

Change 48920 by peter at peter_overcee on 2004/03/13 14:48:32

	converge with current

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/NOTES#21 edit
.. //depot/projects/hammer/sys/conf/options.amd64#29 edit

Differences ...

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

@@ -295,8 +295,6 @@
 #  The Rev 2 host cards use a 32K chunk, on a 32K boundary.
 #  The cards can use an IRQ of 11, 12 or 15.
 
-#XXX#device		cy	1
-#XXX#options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
 device		digi
 hint.digi.0.at="isa"
 hint.digi.0.port="0x104"
@@ -495,10 +493,6 @@
 
 options 	FB_INSTALL_CDEV		# install a CDEV entry in /dev
 
-# PECOFF module (Win32 Execution Format)
-#XXX#options 	PECOFF_SUPPORT		# only knows 32 bit file format
-#XXX#options 	PECOFF_DEBUG
-
 options 	ENABLE_ALART		# Control alarm on Intel intpm driver
 options 	KBDIO_DEBUG=2
 options 	KBD_MAXRETRY=4

==== //depot/projects/hammer/sys/conf/options.amd64#29 (text+ko) ====

@@ -15,8 +15,6 @@
 #COMPAT_SVR4		opt_dontuse.h
 #DEBUG_SVR4		opt_svr4.h
 #NDISAPI		opt_dontuse.h
-#PECOFF_DEBUG		opt_pecoff.h
-#PECOFF_SUPPORT		opt_dontuse.h
 
 CLK_CALIBRATION_LOOP		opt_clock.h
 CLK_USE_I8254_CALIBRATION	opt_clock.h