PERFORCE change 18759 for review

[Robert Watson]

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

Change 18759 by rwatson at rwatson_tislabs on 2002/10/05 13:09:43

	Sync MAC to recent GENERIC changes.

Affected files ...

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

Differences ...

==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#38 (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.363 2002/09/09 02:40:58 kuriyama Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.366 2002/10/05 16:35:30 phk Exp $
 
 machine		i386
 cpu		I486_CPU
@@ -30,6 +30,7 @@
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
+options		NO_GEOM
 options 	MAC
 options 	MAC_DEBUG
 options 	UFS_ACL
@@ -61,7 +62,7 @@
 options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~128k to driver.
 options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
-                                        # output.  Adds ~215k to driver.
+					# output.  Adds ~215k to driver.
 
 # Debugging for use in -current
 options 	ALT_BREAK_TO_DEBUGGER
@@ -133,6 +134,7 @@
 device		amr		# AMI MegaRAID
 device		ida		# Compaq Smart RAID
 device		mlx		# Mylex DAC960 family
+device		pst		# Promise Supertrak SX6000
 device		twe		# 3ware ATA RAID
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message