From owner-p4-projects@FreeBSD.ORG Wed May 7 09:54:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D75137B404; Wed, 7 May 2003 09:54:41 -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 EFC9337B401 for ; Wed, 7 May 2003 09:54:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C2FF43F3F for ; Wed, 7 May 2003 09:54:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47Gse0U045916 for ; Wed, 7 May 2003 09:54:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47GseKN045913 for perforce@freebsd.org; Wed, 7 May 2003 09:54:40 -0700 (PDT) Date: Wed, 7 May 2003 09:54:40 -0700 (PDT) Message-Id: <200305071654.h47GseKN045913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 16:54:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30703 Change 30703 by rwatson@rwatson_tislabs on 2003/05/07 09:54:08 Sync MAC with GENERIC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#44 (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.376 2003/02/13 22:24:43 obrien Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.382 2003/04/21 16:44:04 simokawa Exp $ machine i386 cpu I486_CPU @@ -213,6 +213,7 @@ device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards +device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. device lnc # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of ethernet chips device xe # Xircom pccard ethernet @@ -254,5 +255,11 @@ device uscanner # Scanners # USB Ethernet, requires mii device aue # ADMtek USB ethernet +device axe # ASIX Electronics USB ethernet device cue # CATC USB ethernet device kue # Kawasaki LSI USB ethernet + +# FireWire support +device firewire # FireWire bus code +device sbp # SCSI over FireWire (Requires scbus and da) +device fwe # Ethernet over FireWire (non-standard!)