PERFORCE change 32304 for review

[Robert Watson]

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

Change 32304 by rwatson at rwatson_paprika on 2003/06/01 08:11:43

	Manually integrate MAC kernel config to match recent GENERIC
	changes (all driver additions).

Affected files ...

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

Differences ...

==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#45 (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.382 2003/04/21 16:44:04 simokawa Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.384 2003/05/18 20:39:15 ru Exp $
 
 machine		i386
 cpu		I486_CPU
@@ -133,6 +133,7 @@
 device		aacp		# SCSI passthrough for aac (requires CAM)
 device		amr		# AMI MegaRAID
 device		ida		# Compaq Smart RAID
+device		ips		# IBM (Adaptec) ServeRAID
 device		mlx		# Mylex DAC960 family
 device		pst		# Promise Supertrak SX6000
 device		twe		# 3ware ATA RAID
@@ -198,7 +199,9 @@
 device		rl		# RealTek 8129/8139
 device		sf		# Adaptec AIC-6915 (``Starfire'')
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
+device		sk		# SysKonnect SK-984x and SK-982x gigabit ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
+device		ti		# Alteon Networks Tigon I/II gigabit ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
 device		vr		# VIA Rhine, Rhine II