From owner-p4-projects Fri Jun 28 19:16:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17FD237B400; Fri, 28 Jun 2002 19:16:14 -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 B39A437B405 for ; Fri, 28 Jun 2002 19:16:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 147CE43E13 for ; Fri, 28 Jun 2002 19:16:12 -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.4/8.12.4) with ESMTP id g5T2GBJU092264 for ; Fri, 28 Jun 2002 19:16:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T2GBuZ092258 for perforce@freebsd.org; Fri, 28 Jun 2002 19:16:11 -0700 (PDT) Date: Fri, 28 Jun 2002 19:16:11 -0700 (PDT) Message-Id: <200206290216.g5T2GBuZ092258@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 13560 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=13560 Change 13560 by rwatson@rwatson_tislabs on 2002/06/28 19:16:06 Sync to GENERIC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#32 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#32 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. 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.341 2002/05/03 17:59:22 jmallett Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.345 2002/06/06 16:35:58 gibbs Exp $ machine i386 cpu I486_CPU @@ -60,7 +60,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detects deadlocks and cycles +options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed options ALT_BREAK_TO_DEBUGGER @@ -87,6 +87,7 @@ # SCSI Controllers device ahb # EISA AHA1742 family device ahc # AHA2940 and onboard AIC7xxx devices +device ahd # AHA39320 and onboard AIC79xx devices device amd # AMD 53C974 (Tekram DC-390(T)) device isp # Qlogic family #device ncr # NCR/Symbios Logic @@ -170,6 +171,7 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') +device em # Intel PRO/1000 adapter Gigabit Ethernet Card device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message