From owner-p4-projects Sat Aug 17 16:16: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F85837B401; Sat, 17 Aug 2002 16:16:05 -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 0143637B400 for ; Sat, 17 Aug 2002 16:16:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0D5C43E70 for ; Sat, 17 Aug 2002 16:16:04 -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 g7HNG4JU026833 for ; Sat, 17 Aug 2002 16:16:04 -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 g7HNG4Ol026829 for perforce@freebsd.org; Sat, 17 Aug 2002 16:16:04 -0700 (PDT) Date: Sat, 17 Aug 2002 16:16:04 -0700 (PDT) Message-Id: <200208172316.g7HNG4Ol026829@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 16170 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=16170 Change 16170 by rwatson@rwatson_tislabs on 2002/08/17 16:15:59 Sync MAC kernel to GENERIC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#36 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#36 (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.356 2002/08/07 05:40:34 imp Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.359 2002/08/15 08:05:40 imp Exp $ machine i386 cpu I486_CPU @@ -93,6 +93,7 @@ device ahd # AHA39320 and onboard AIC79xx devices device amd # AMD 53C974 (Tekram DC-390(T)) device isp # Qlogic family +device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -159,7 +160,7 @@ # PCCARD (PCMCIA) support # Pcmcia and cardbus bridge support -device pccbb # cardbus (yenta) bridge +device cbb # cardbus (yenta) bridge #device pcic # ExCA ISA and PCI bridges device pccard # PC Card (16-bit) bus device cardbus # CardBus (32-bit) bus To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message