From cb505683e3f0f8ccd114c73990cb019f62b1beaa Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 12 Nov 2002 19:30:00 +0000
Subject: [PATCH] Make 'agp', 'tun', and 'if_txp' be modules on the mfsroot
 floppy instead of just removing them from BOOTMFS using dokern.sh.

---
 release/amd64/dokern.sh   | 3 ---
 release/i386/dokern.sh    | 3 ---
 release/i386/drivers.conf | 3 +++
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/release/amd64/dokern.sh b/release/amd64/dokern.sh
index 727c006e9558..5346927fb5c0 100755
--- a/release/amd64/dokern.sh
+++ b/release/amd64/dokern.sh
@@ -21,7 +21,6 @@ sed	\
 	-e '/UFS_ACL/d' \
 	-e '/UFS_DIRHASH/d' \
 	-e '/WITNESS/d' \
-	-e '/	agp	/d' \
 	-e '/	atapist	/d' \
 	-e '/	faith	/d' \
 	-e '/	gif	/d' \
@@ -34,8 +33,6 @@ sed	\
 	-e '/	random	/d' \
 	-e '/	ses	/d' \
 	-e '/	splash	/d' \
-	-e '/	tun	/d' \
-	-e '/	txp	/d' \
 	-e '/	ugen	/d' \
 	-e '/	uhid	/d' \
 	-e '/	ulpt	/d' \
diff --git a/release/i386/dokern.sh b/release/i386/dokern.sh
index 727c006e9558..5346927fb5c0 100755
--- a/release/i386/dokern.sh
+++ b/release/i386/dokern.sh
@@ -21,7 +21,6 @@ sed	\
 	-e '/UFS_ACL/d' \
 	-e '/UFS_DIRHASH/d' \
 	-e '/WITNESS/d' \
-	-e '/	agp	/d' \
 	-e '/	atapist	/d' \
 	-e '/	faith	/d' \
 	-e '/	gif	/d' \
@@ -34,8 +33,6 @@ sed	\
 	-e '/	random	/d' \
 	-e '/	ses	/d' \
 	-e '/	splash	/d' \
-	-e '/	tun	/d' \
-	-e '/	txp	/d' \
 	-e '/	ugen	/d' \
 	-e '/	uhid	/d' \
 	-e '/	ulpt	/d' \
diff --git a/release/i386/drivers.conf b/release/i386/drivers.conf
index 8bc1baa4c0fb..dcebdcd776c0 100644
--- a/release/i386/drivers.conf
+++ b/release/i386/drivers.conf
@@ -37,6 +37,7 @@
 #
 
 #drv	filename	floppy	type	description
+agp	agp		2	video	"AGP Host Bridge support"
 an	if_an		2	network	"Aironet 4500/4800 802.11 PCMCIA/ISA/PCI card"
 aue	if_aue		2	network	"ADMtek USB ethernet adapter"
 cue	if_cue		2	network	"CATC USB ethernet adapter"
@@ -52,6 +53,8 @@ rl	if_rl		2	network	"RealTek 8129/8139 PCI ethernet card"
 sf	if_sf		2	network	"Adaptec AIC-6915 PCI ethernet card"
 sis	if_sis		2	network	"SiS 900/SiS 7016 PCI ethernet card"
 ste	if_ste		2	network	"Sundance ST201 PCI ethernet card"
+tun	if_tun		2	network	"Tunnel software network interface"
+txp	if_txp		2	network	"3COM 3cR990 PCI ethernet card"
 vr	if_vr		2	network	"VIA VT3043/VT86C100A Rhine PCI ethernet card"
 vx	if_vx		2	network	"3Com 3c590/3c595 PCI ethernet card"
 wb	if_wb		2	network	"Winbond W89C840F PCI ethernet card"