Resync to GENERIC. This backs out the spammage that I committed wrt

killing ipv6 and some other things.

This makes GENERIC and NEWCARD the same, with OLDCARD stuff commented
out and the NEWCARD stuff included.  For the moment, pcic is commented
out (which has a old).  Plus invariants.  Plus ddb.

1 files changed, 15 insertions, 23 deletions

diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD
index d1ee745..19a5d86 100644
--- a/sys/i386/conf/NEWCARD
+++ b/sys/i386/conf/NEWCARD
@@ -40,7 +40,7 @@ maxusers	32
 
 options 	MATH_EMULATE		#Support for x87 emulation
 options 	INET			#InterNETworking
-#options 	INET6			#IPv6 communications protocols
+options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	MFS			#Memory Filesystem
@@ -49,10 +49,10 @@ options 	NFS			#Network Filesystem
 options 	NFS_ROOT		#NFS usable as root device, NFS required
 options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem
-#options 	DEVFS			#Device Filesystem
+options 	DEVFS			#Device Filesystem
 options 	PROCFS			#Process filesystem
 options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options 	SCSI_DELAY=1000		#Delay (in ms) before probing SCSI
+options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
 options 	UCONSOLE		#Allow users to grab the console
 options 	USERCONFIG		#boot -c editor
 options 	VISUAL_USERCONFIG	#visual boot -c editor
@@ -68,18 +68,11 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #options 	APIC_IO			# Symmetric (APIC) I/O
 
-options		IPFIREWALL
-options		DUMMYNET
-options		IPFIREWALL_DEFAULT_TO_ACCEPT
-options		IPDIVERT
-
 device		isa
 device		eisa
 device		pci
 device		pccard
-device		pmtimer
 device		cardbus
-#options 	COMPAT_OLDISA		# compatability shims for lnc, le
 
 # Floppy drives
 device		fdc
@@ -96,16 +89,16 @@ options 	ATA_STATIC_ID		#Static device numbering
 # SCSI Controllers
 device		ahb		# EISA AHA1742 family
 device		ahc		# AHA2940 and onboard AIC7xxx devices
-device		amd		# AMD 53C974 (Teckram DC-390(T))
+device		amd		# AMD 53C974 (Tekram DC-390(T))
 device		isp		# Qlogic family
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 
-device		adv		# Advansys scsi adapters
-device		adw		# Advansys wide scsi adapters
-device		aha		# Adaptec 154x scsi adapters
-device		aic		# Adaptec 15[012]x scsi adapters, AIC-6[23]60.
-device		bt		# Buslogic/Mylex MultiMaster scsi adapters
+device		adv		# Advansys SCSI adapters
+device		adw		# Advansys wide SCSI adapters
+device		aha		# Adaptec 154x SCSI adapters
+device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
+device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
 
 device		ncv		# NCR 53C500
 device		nsp		# Workbit Ninja SCSI-3
@@ -157,11 +150,10 @@ device		npx
 device		apm
 # Add suspend/resume support for the i8254.
 device		pmtimer
- 
+
 # Audio support
 device		pcm
 
-
 # Pcmcia and cardbus bridge support
 #device		pcic			# pcmcia bridge
 device		pccbb			# cardbus (yenta) bridge
@@ -180,7 +172,6 @@ device		ppi		# Parallel port interface device
 
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 device		wx		# Intel Gigabit Ethernet Card (``Wiseman'')
 
@@ -188,6 +179,7 @@ device		wx		# Intel Gigabit Ethernet Card (``Wiseman'')
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
 device		dc		# DEC/Intel 21143 and various workalikes
+device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 device		pcn		# AMD Am79C79x PCI 10/100 NICs
 device		rl		# RealTek 8129/8139
 device		sf		# Adaptec AIC-6915 (``Starfire'')
@@ -212,7 +204,7 @@ device		xe		# Xircom pccard ethernet
 # The probe order of these is presently determined by i386/isa/isa_compat.c.
 #device		ie
 #device		le
-#device		lnc
+device		lnc
 
 # Wireless NIC cards
 device		an		# Aironet 4500/4800 802.11 wireless NICs. 
@@ -220,7 +212,7 @@ device		awi		# BayStack 660 and others
 device		wi		# WaveLAN/IEEE 802.11 wireless NICs. 
 #device		wl		# Older non 802.11 Wavelan wireless NIC.
 
-# Pseudo devices - the number indicates how many units to allocated.
+# Pseudo devices - the number indicates how many units to allocate.
 device		random		# Entropy device
 device		loop		# Network loopback
 device		ether		# Ethernet support
@@ -229,8 +221,8 @@ device		ppp	1	# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
-#device		gif	4	# IPv6 and IPv4 tunneling
-#device		faith	1	# IPv6-to-IPv4 relaying (translation)
+device		gif	4	# IPv6 and IPv4 tunneling
+device		faith	1	# IPv6-to-IPv4 relaying (translation)
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!