From owner-p4-projects Mon Jan 20 19:19:44 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EEB337B405; Mon, 20 Jan 2003 19:19:42 -0800 (PST) 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 D190337B401 for ; Mon, 20 Jan 2003 19:19:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 797C543F13 for ; Mon, 20 Jan 2003 19:19:41 -0800 (PST) (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 h0L3Jffh074550 for ; Mon, 20 Jan 2003 19:19:41 -0800 (PST) (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 h0L3JffP074547 for perforce@freebsd.org; Mon, 20 Jan 2003 19:19:41 -0800 (PST) Date: Mon, 20 Jan 2003 19:19:41 -0800 (PST) Message-Id: <200301210319.h0L3JffP074547@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 Subject: PERFORCE change 23999 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://perforce.freebsd.org/chv.cgi?CH=23999 Change 23999 by rwatson@rwatson_paprika on 2003/01/20 19:19:00 Manually change recent GENERIC changes into MAC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#42 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#42 (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.369 2002/10/19 16:54:07 rwatson Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.372 2003/01/16 00:21:52 sam Exp $ machine i386 cpu I486_CPU @@ -99,6 +99,7 @@ device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') +device trm # Tekram DC395U/UW/F DC315U adapters device adv # Advansys SCSI adapters device adw # Advansys wide SCSI adapters @@ -202,6 +203,7 @@ device vr # VIA Rhine, Rhine II device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') +device bge # Broadcom BCM570xx Gigabit Ethernet # ISA Ethernet NICs. pccard nics included. device cs # Crystal Semiconductor CS89x0 NIC @@ -218,6 +220,7 @@ #device le # Wireless NIC cards +device wlan # 802.11 support device an # Aironet 4500/4800 802.11 wireless NICs. device awi # BayStack 660 and others device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message