diff --git a/sys/arch/atari/conf/ATARITT b/sys/arch/atari/conf/ATARITT
index bbadcc5e2d91..169021af4cc9 100644
--- a/sys/arch/atari/conf/ATARITT
+++ b/sys/arch/atari/conf/ATARITT
@@ -1,12 +1,12 @@
 #
-# $NetBSD: ATARITT,v 1.44 2002/04/12 22:34:13 leo Exp $
+# $NetBSD: ATARITT,v 1.45 2002/04/12 22:37:21 leo Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: ATARITT.in,v 1.4 2001/04/10 06:28:38 leo Exp $
-#		NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
+#		NetBSD: GENERIC.in,v 1.17 2002/04/12 22:34:13 leo Exp $
 
 #This configuration file is for a GENERIC ATARI-TT
 
@@ -129,6 +129,7 @@ options 	SYSVSEM			# System V semaphores
 
 options 	KTRACE			# Add kernel tracing system call
 options 	DIAGNOSTIC		# Add additional error checking code
+#options 	USERCONF		# userconf(4) support
 #options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
 #These options enable verbose messages for several subsystems.
diff --git a/sys/arch/atari/conf/BOOT b/sys/arch/atari/conf/BOOT
index 5adb57ae453b..ec4d5e71608c 100644
--- a/sys/arch/atari/conf/BOOT
+++ b/sys/arch/atari/conf/BOOT
@@ -1,12 +1,12 @@
 #
-# $NetBSD: BOOT,v 1.43 2002/04/12 22:34:13 leo Exp $
+# $NetBSD: BOOT,v 1.44 2002/04/12 22:37:21 leo Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: FALCON.in,v 1.5 2001/11/20 11:29:41 lukem Exp $
-#		NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
+#		NetBSD: GENERIC.in,v 1.17 2002/04/12 22:34:13 leo Exp $
 
 #This configuration file is for a generic ATARI-Falcon
 
diff --git a/sys/arch/atari/conf/BOOTX b/sys/arch/atari/conf/BOOTX
index cc94bd2c0f8a..39d980f683a8 100644
--- a/sys/arch/atari/conf/BOOTX
+++ b/sys/arch/atari/conf/BOOTX
@@ -1,12 +1,12 @@
 #
-# $NetBSD: BOOTX,v 1.37 2002/04/12 22:34:13 leo Exp $
+# $NetBSD: BOOTX,v 1.38 2002/04/12 22:37:21 leo Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: FALCON.in,v 1.5 2001/11/20 11:29:41 lukem Exp $
-#		NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
+#		NetBSD: GENERIC.in,v 1.17 2002/04/12 22:34:13 leo Exp $
 
 #This configuration file is for a generic ATARI-Falcon
 
diff --git a/sys/arch/atari/conf/FALCON b/sys/arch/atari/conf/FALCON
index eee78d4d8f81..458308eb19cf 100644
--- a/sys/arch/atari/conf/FALCON
+++ b/sys/arch/atari/conf/FALCON
@@ -1,12 +1,12 @@
 #
-# $NetBSD: FALCON,v 1.44 2002/04/12 22:34:13 leo Exp $
+# $NetBSD: FALCON,v 1.45 2002/04/12 22:37:21 leo Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: FALCON.in,v 1.5 2001/11/20 11:29:41 lukem Exp $
-#		NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
+#		NetBSD: GENERIC.in,v 1.17 2002/04/12 22:34:13 leo Exp $
 
 #This configuration file is for a generic ATARI-Falcon
 
@@ -132,6 +132,7 @@ options 	SYSVSEM			# System V semaphores
 
 options 	KTRACE			# Add kernel tracing system call
 options 	DIAGNOSTIC		# Add additional error checking code
+#options 	USERCONF		# userconf(4) support
 #options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
 #These options enable verbose messages for several subsystems.
diff --git a/sys/arch/atari/conf/HADES b/sys/arch/atari/conf/HADES
index 5747fd368779..c2881b75d419 100644
--- a/sys/arch/atari/conf/HADES
+++ b/sys/arch/atari/conf/HADES
@@ -1,12 +1,12 @@
 #
-# $NetBSD: HADES,v 1.34 2002/04/12 22:34:13 leo Exp $
+# $NetBSD: HADES,v 1.35 2002/04/12 22:37:22 leo Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: HADES.in,v 1.4 2001/04/10 06:28:38 leo Exp $
-#		NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
+#		NetBSD: GENERIC.in,v 1.17 2002/04/12 22:34:13 leo Exp $
 
 #This configuration file is for a generic Medusa-Hades
 
@@ -128,6 +128,7 @@ options 	SYSVSEM			# System V semaphores
 
 options 	KTRACE			# Add kernel tracing system call
 options 	DIAGNOSTIC		# Add additional error checking code
+#options 	USERCONF		# userconf(4) support
 #options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
 #These options enable verbose messages for several subsystems.
@@ -194,26 +195,9 @@ pseudo-device	ipfilter		# IP filtering device
 pseudo-device	rnd			# /dev/random and in-kernel generator
 
 #MII/PHY support
-acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
-amhphy*	at mii? phy ?			# AMD 79c901 Ethernet PHYs
-bmtphy*	at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
-brgphy*	at mii? phy ?			# Broadcom BCM5400-family PHYs
-dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
 exphy*	at mii? phy ?			# 3Com internal PHYs
-glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
-gphyter* at mii? phy ?			# NS83861 Gig-E PHY
-icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS1890
 inphy*	at mii? phy ?			# Intel 82555 PHYs
 iophy*	at mii? phy ?			# Intel 82553 PHYs
-lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
-makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
-nsphy*	at mii? phy ?			# NS83840 PHYs
-nsphyter* at mii? phy ?			# NS83843 PHYs
-pnaphy*	at mii? phy ?			# generic HomePNA PHYs
-qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
-sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
-tlphy*	at mii? phy ?			# ThunderLAN PHYs
-tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
 ukphy*	at mii? phy ?			# generic unknown PHYs
 
 #PCI network interfaces
diff --git a/sys/arch/atari/conf/MILAN-ISAIDE b/sys/arch/atari/conf/MILAN-ISAIDE
index 68bd1c2725aa..d2b57a04a590 100644
--- a/sys/arch/atari/conf/MILAN-ISAIDE
+++ b/sys/arch/atari/conf/MILAN-ISAIDE
@@ -1,12 +1,12 @@
 #
-# $NetBSD: MILAN-ISAIDE,v 1.9 2002/04/12 22:34:14 leo Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.10 2002/04/12 22:37:22 leo Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: MILAN.in,v 1.8 2001/11/20 11:29:41 lukem Exp $
-#		NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
+#		NetBSD: GENERIC.in,v 1.17 2002/04/12 22:34:13 leo Exp $
 
 #This configuration file is for a generic Milan
 
@@ -128,6 +128,7 @@ options 	SYSVSEM			# System V semaphores
 
 options 	KTRACE			# Add kernel tracing system call
 options 	DIAGNOSTIC		# Add additional error checking code
+#options 	USERCONF		# userconf(4) support
 #options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
 #These options enable verbose messages for several subsystems.
@@ -191,26 +192,9 @@ pseudo-device	ipfilter		# IP filtering device
 pseudo-device	rnd			# /dev/random and in-kernel generator
 
 #MII/PHY support
-acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
-amhphy*	at mii? phy ?			# AMD 79c901 Ethernet PHYs
-bmtphy*	at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
-brgphy*	at mii? phy ?			# Broadcom BCM5400-family PHYs
-dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
 exphy*	at mii? phy ?			# 3Com internal PHYs
-glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
-gphyter* at mii? phy ?			# NS83861 Gig-E PHY
-icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS1890
 inphy*	at mii? phy ?			# Intel 82555 PHYs
 iophy*	at mii? phy ?			# Intel 82553 PHYs
-lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
-makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
-nsphy*	at mii? phy ?			# NS83840 PHYs
-nsphyter* at mii? phy ?			# NS83843 PHYs
-pnaphy*	at mii? phy ?			# generic HomePNA PHYs
-qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
-sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
-tlphy*	at mii? phy ?			# ThunderLAN PHYs
-tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
 ukphy*	at mii? phy ?			# generic unknown PHYs
 
 #PCI network interfaces
diff --git a/sys/arch/atari/conf/MILAN-PCIIDE b/sys/arch/atari/conf/MILAN-PCIIDE
index bab1b407ff8c..4e5c185d4627 100644
--- a/sys/arch/atari/conf/MILAN-PCIIDE
+++ b/sys/arch/atari/conf/MILAN-PCIIDE
@@ -1,12 +1,12 @@
 #
-# $NetBSD: MILAN-PCIIDE,v 1.9 2002/04/12 22:34:14 leo Exp $
+# $NetBSD: MILAN-PCIIDE,v 1.10 2002/04/12 22:37:22 leo Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: MILAN.in,v 1.8 2001/11/20 11:29:41 lukem Exp $
-#		NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
+#		NetBSD: GENERIC.in,v 1.17 2002/04/12 22:34:13 leo Exp $
 
 #This configuration file is for a generic Milan
 
@@ -128,6 +128,7 @@ options 	SYSVSEM			# System V semaphores
 
 options 	KTRACE			# Add kernel tracing system call
 options 	DIAGNOSTIC		# Add additional error checking code
+#options 	USERCONF		# userconf(4) support
 #options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
 #These options enable verbose messages for several subsystems.
@@ -191,26 +192,9 @@ pseudo-device	ipfilter		# IP filtering device
 pseudo-device	rnd			# /dev/random and in-kernel generator
 
 #MII/PHY support
-acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
-amhphy*	at mii? phy ?			# AMD 79c901 Ethernet PHYs
-bmtphy*	at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
-brgphy*	at mii? phy ?			# Broadcom BCM5400-family PHYs
-dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
 exphy*	at mii? phy ?			# 3Com internal PHYs
-glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
-gphyter* at mii? phy ?			# NS83861 Gig-E PHY
-icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS1890
 inphy*	at mii? phy ?			# Intel 82555 PHYs
 iophy*	at mii? phy ?			# Intel 82553 PHYs
-lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
-makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
-nsphy*	at mii? phy ?			# NS83840 PHYs
-nsphyter* at mii? phy ?			# NS83843 PHYs
-pnaphy*	at mii? phy ?			# generic HomePNA PHYs
-qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
-sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
-tlphy*	at mii? phy ?			# ThunderLAN PHYs
-tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
 ukphy*	at mii? phy ?			# generic unknown PHYs
 
 #PCI network interfaces