PERFORCE change 61914 for review

[Peter Wemm]

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

Change 61914 by peter at peter_melody on 2004/09/22 00:16:52

	Integ -I -b i386_hammer - mostly a metadata sync-up but pick up
	GENERIC ispfw change.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#22 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#107 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#57 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#22 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#107 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/conf/GENERIC#57 (text+ko) ====

@@ -98,6 +98,7 @@
 device		ahd		# AHA39320/29320 and onboard AIC79xx devices
 device		amd		# AMD 53C974 (Tekram DC-390(T))
 device		isp		# Qlogic family
+#device 	ispfw		# Firmware for QLogic HBAs- normally a module
 device		mpt		# LSI-Logic MPT-Fusion
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')