Index: release/i386/drivers.conf
===================================================================
RCS file: /a/ncvs/src/release/i386/drivers.conf,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 drivers.conf
--- release/i386/drivers.conf	18 Jan 2002 05:58:43 -0000	1.3.2.2
+++ release/i386/drivers.conf	22 Jan 2002 08:18:39 -0000
@@ -37,3 +37,4 @@
 #drv	filename	floppy	type	description
 an	if_an		2	network	"Aironet 4500/4800 802.11 PCMCIA/ISA/PCI card"
 wi	if_wi		2	network	"Lucent WaveLAN/IEEE 802.11 PCMCIA card"
+txp	if_txp		2	network "3Com 3cR990 (``Typhoon'') PCI Ethernet"
Index: release/i386/mkisoimages.sh
===================================================================
RCS file: /a/ncvs/src/release/i386/mkisoimages.sh,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 mkisoimages.sh
--- release/i386/mkisoimages.sh	4 Sep 2001 16:51:52 -0000	1.2.2.3
+++ release/i386/mkisoimages.sh	18 Jan 2002 06:49:25 -0000
@@ -53,4 +53,4 @@
 LABEL=$1; shift
 NAME=$1; shift
 
-mkisofs $bootable -r -J -h -V $LABEL -o $NAME $*
+mkisofs $bootable -r -J -V $LABEL -o $NAME $*
Index: release/scripts/dokern.sh
===================================================================
RCS file: /a/ncvs/src/release/scripts/Attic/dokern.sh,v
retrieving revision 1.23.2.25
diff -u -r1.23.2.25 dokern.sh
--- release/scripts/dokern.sh	18 Jan 2002 05:58:43 -0000	1.23.2.25
+++ release/scripts/dokern.sh	22 Jan 2002 08:20:33 -0000
@@ -40,6 +40,7 @@
 	-e '/	xl/d' \
 	-e '/	an$/d' \
 	-e '/	wi$/d' \
+	-e '/	txp$/d' \
 	-e '/pty/d' \
 	-e '/pass/d' \
 	-e '/	apm/d' \
@@ -90,6 +91,7 @@
 	-e '/	ncr/d' \
 	-e '/	an$/d' \
 	-e '/	wi$/d' \
+	-e '/	txp$/d' \
 	-e '/atapist/d' \
 	-e '/lpt/d' \
 	-e '/ppi/d' \
Index: sys/i386/conf/GENERIC
===================================================================
RCS file: /a/ncvs/src/sys/i386/conf/GENERIC,v
retrieving revision 1.246.2.37
diff -u -r1.246.2.37 GENERIC
--- sys/i386/conf/GENERIC	19 Dec 2001 18:34:45 -0000	1.246.2.37
+++ sys/i386/conf/GENERIC	22 Jan 2002 08:15:49 -0000
@@ -190,6 +190,7 @@
 device		wb		# Winbond W89C840F
 device		wx		# Intel Gigabit Ethernet Card (``Wiseman'')
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+device		bge		# Broadcom BCM570x (``Tigon III'')
 
 # ISA Ethernet NICs.
 # 'device ed' requires 'device miibus'