From owner-p4-projects Sat Oct 5 13:10:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 430D037B404; Sat, 5 Oct 2002 13:10:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1E8D37B401 for ; Sat, 5 Oct 2002 13:10:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 999BD43E42 for ; Sat, 5 Oct 2002 13:10:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g95KAFCo064943 for ; Sat, 5 Oct 2002 13:10:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g95KAFAV064940 for perforce@freebsd.org; Sat, 5 Oct 2002 13:10:15 -0700 (PDT) Date: Sat, 5 Oct 2002 13:10:15 -0700 (PDT) Message-Id: <200210052010.g95KAFAV064940@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18759 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18759 Change 18759 by rwatson@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@FreeBSD.org with "unsubscribe p4-projects" in the body of the message