PERFORCE change 23999 for review

[Robert Watson]

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

Change 23999 by rwatson at rwatson_paprika on 2003/01/20 19:19:00

	Manually change recent GENERIC changes into MAC.

Affected files ...

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

Differences ...

==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#42 (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.369 2002/10/19 16:54:07 rwatson Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.372 2003/01/16 00:21:52 sam Exp $
 
 machine		i386
 cpu		I486_CPU
@@ -99,6 +99,7 @@
 device		mpt		# LSI-Logic MPT-Fusion
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
+device		trm		# Tekram DC395U/UW/F DC315U adapters
 
 device		adv		# Advansys SCSI adapters
 device		adw		# Advansys wide SCSI adapters
@@ -202,6 +203,7 @@
 device		vr		# VIA Rhine, Rhine II
 device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+device		bge		# Broadcom BCM570xx Gigabit Ethernet
 
 # ISA Ethernet NICs.  pccard nics included.
 device		cs		# Crystal Semiconductor CS89x0 NIC
@@ -218,6 +220,7 @@
 #device		le
 
 # Wireless NIC cards
+device		wlan		# 802.11 support
 device		an		# Aironet 4500/4800 802.11 wireless NICs. 
 device		awi		# BayStack 660 and others
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message