PERFORCE change 16170 for review

[Robert Watson]

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16170

Change 16170 by rwatson at rwatson_tislabs on 2002/08/17 16:15:59

	Sync MAC kernel to GENERIC.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#36 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#36 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.356 2002/08/07 05:40:34 imp Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.359 2002/08/15 08:05:40 imp Exp $
 
 machine		i386
 cpu		I486_CPU
@@ -93,6 +93,7 @@
 device		ahd		# AHA39320 and onboard AIC79xx devices
 device		amd		# AMD 53C974 (Tekram DC-390(T))
 device		isp		# Qlogic family
+device		mpt		# LSI-Logic MPT-Fusion
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 
@@ -159,7 +160,7 @@
 
 # PCCARD (PCMCIA) support
 # Pcmcia and cardbus bridge support
-device		pccbb			# cardbus (yenta) bridge
+device		cbb			# cardbus (yenta) bridge
 #device		pcic			# ExCA ISA and PCI bridges
 device		pccard			# PC Card (16-bit) bus
 device		cardbus			# CardBus (32-bit) bus
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message