PERFORCE change 15717 for review

[Robert Watson]

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15717

Change 15717 by rwatson at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message