From owner-p4-projects Thu Aug 8 23:24: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED92837B401; Thu, 8 Aug 2002 23:24:03 -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 A707D37B400 for ; Thu, 8 Aug 2002 23:24:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60B6E43E4A for ; Thu, 8 Aug 2002 23:24:03 -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 g796O3JU011950 for ; Thu, 8 Aug 2002 23:24:03 -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 g796O3Fj011947 for perforce@freebsd.org; Thu, 8 Aug 2002 23:24:03 -0700 (PDT) Date: Thu, 8 Aug 2002 23:24:03 -0700 (PDT) Message-Id: <200208090624.g796O3Fj011947@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 15717 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=15717 Change 15717 by rwatson@rwatson_paprika on 2002/08/08 23:23:09 sync to recently integ'd GENERIC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#34 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#34 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -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.352 2002/07/23 06:35:08 peter Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.356 2002/08/07 05:40:34 imp Exp $ machine i386 cpu I486_CPU @@ -74,7 +74,6 @@ device isa device eisa device pci -#options PCI_ENABLE_IO_MODES # Enable pci resources left off by a "lazy BIOS" # Floppy drives device fdc @@ -147,6 +146,8 @@ #options XSERVER # support for X server on a vt console #options FAT_CURSOR # start with block cursor +device agp # support several AGP chipsets + # Floating point support - do not disable. device npx @@ -213,7 +214,7 @@ # Wireless NIC cards device an # Aironet 4500/4800 802.11 wireless NICs. device awi # BayStack 660 and others -device wi # WaveLAN/IEEE 802.11 wireless NICs. +device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. #device wl # Older non 802.11 Wavelan wireless NIC. # Pseudo devices - the number indicates how many units to allocate. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message