19 files changed, 162 insertions, 50 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 0023ba9bcac..283dfc454a8 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,5 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.143 2005/04/20 14:46:03 jsg Exp $
-#	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
+#	$OpenBSD: GENERIC,v 1.144 2005/04/30 00:36:03 deraadt Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine	alpha
 
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index fc4e57d90c2..8b81472f0ff 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,7 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.60 2005/04/01 20:04:32 marco Exp $
+#	$OpenBSD: GENERIC,v 1.61 2005/04/30 00:36:03 deraadt Exp $
 #
-#	GENERIC -- everything that's currently supported
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
 #
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine		amd64		# architecture, used by config; REQUIRED
 
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index 831b60f26e3..75c5e7e8a9a 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,13 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.20 2005/02/15 11:03:46 jsg Exp $
-#
-# GENERIC machine description file
-#
-# This machine description file is used to generate the default OpenBSD
-# kernel.  The generic kernel does not include all options, subsystems
-# and device drivers, but should be useful for most applications.
-#
-# The machine description file can be customised for your specific
-# machine to reduce the kernel size and improve its performance.
+#	$OpenBSD: GENERIC,v 1.21 2005/04/30 00:36:04 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index d7938c0c2b6..06082f757f5 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,8 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.38 2005/04/22 11:59:11 miod Exp $
-#	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
+#	$OpenBSD: GENERIC,v 1.39 2005/04/30 00:36:04 deraadt Exp $
 #
-# Generic kernel - one size fits all.
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
 #
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine hp300 m68k
 
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index cd0addaf3ec..de477e063cc 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.68 2005/03/26 21:42:26 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.69 2005/04/30 00:36:04 deraadt Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 # Machine architecture; required by config(8)
 machine		hppa
diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC
index db3760bcc32..61cd64990c1 100644
--- a/sys/arch/hppa64/conf/GENERIC
+++ b/sys/arch/hppa64/conf/GENERIC
@@ -1,4 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.1 2005/04/01 10:40:47 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.2 2005/04/30 00:36:04 deraadt Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 # Machine architecture; required by config(8)
 machine		hppa64
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e60b96da852..e0ca63656fc 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,7 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.407 2005/04/14 20:21:07 brad Exp $
+#	$OpenBSD: GENERIC,v 1.408 2005/04/30 00:36:04 deraadt Exp $
 #
-#	GENERIC -- everything that's currently supported
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
 #
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -176,7 +182,8 @@ radio*	at udsbr?		# USB radio
 #ubt*	at uhub?		# USB Bluetooth
 ugen*	at uhub?		# USB Generic driver
 ural*	at uhub?		# Ralink RT2500
-
+option	NATM
+ueagle*	at uhub?		# Analog Devices Eagle ADSL
 puc*	at pci?			# PCI "universal" communication device
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
diff --git a/sys/arch/luna88k/conf/GENERIC b/sys/arch/luna88k/conf/GENERIC
index 21f40bed6e9..dd5d4758312 100644
--- a/sys/arch/luna88k/conf/GENERIC
+++ b/sys/arch/luna88k/conf/GENERIC
@@ -1,4 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.6 2004/09/16 09:35:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.7 2005/04/30 00:36:04 deraadt Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine		luna88k m88k
 
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index ec8b7d4f35b..d2500af1018 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,7 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.37 2004/12/03 06:37:51 miod Exp $
-#	$NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
+#	$OpenBSD: GENERIC,v 1.38 2005/04/30 00:36:04 deraadt Exp $
 #
-# GENERIC - an all-in-one kernel for the mac68k
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine	mac68k m68k
 include "conf/GENERIC"
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index f4a494e0b05..1f057ea2adb 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,7 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.79 2005/04/26 22:10:35 dlg Exp $g
+#	$OpenBSD: GENERIC,v 1.80 2005/04/30 00:36:04 deraadt Exp $g
 #
-# PPC GENERIC config file
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
 #
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine		macppc powerpc
 
diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index 4494458b3e4..d2135c85c5e 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,4 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.22 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.23 2005/04/30 00:36:04 deraadt Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine		mvme68k m68k
 
diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 2f3e5782af8..15c0fcf0f92 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.44 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.45 2005/04/30 00:36:05 deraadt Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine		mvme88k m88k
 
diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC
index ee5d659361e..9089a51d64d 100644
--- a/sys/arch/mvmeppc/conf/GENERIC
+++ b/sys/arch/mvmeppc/conf/GENERIC
@@ -1,7 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.6 2004/09/16 09:35:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.7 2005/04/30 00:36:05 deraadt Exp $
 #
-# MVMEPPC GENERIC config file
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
 #
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine		mvmeppc powerpc
 
diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC
index 61afea2962d..e5b72ec8de6 100644
--- a/sys/arch/sgi/conf/GENERIC
+++ b/sys/arch/sgi/conf/GENERIC
@@ -1,5 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.13 2005/01/25 19:59:48 kettenis Exp $
+#	$OpenBSD: GENERIC,v 1.14 2005/04/30 00:36:05 deraadt Exp $
 #
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine		sgi mips64
 
diff --git a/sys/arch/solbourne/conf/GENERIC b/sys/arch/solbourne/conf/GENERIC
index 80721546304..287a5acd1e9 100644
--- a/sys/arch/solbourne/conf/GENERIC
+++ b/sys/arch/solbourne/conf/GENERIC
@@ -1,4 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.1 2005/04/19 21:30:17 miod Exp $
+#	$OpenBSD: GENERIC,v 1.2 2005/04/30 00:36:05 deraadt Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 # Machine architecture; required by config(8)
 machine		solbourne sparc
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index fb1b0cebfe4..40c4960bcdf 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,5 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.80 2005/04/14 20:15:58 brad Exp $
-# 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
+#	$OpenBSD: GENERIC,v 1.81 2005/04/30 00:36:05 deraadt Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 # Machine architecture; required by config(8)
 machine		sparc
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 8a5b602ed4f..2bb71ea88cf 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,5 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.122 2005/04/14 19:59:49 brad Exp $
-# 	$NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
+#	$OpenBSD: GENERIC,v 1.123 2005/04/30 00:36:05 deraadt Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine		sparc64
 
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 82025bc3f7e..6d418e4e558 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,5 +1,13 @@
-#	$OpenBSD: GENERIC,v 1.36 2004/09/16 09:35:37 deraadt Exp $
-#	$NetBSD: GENERIC,v 1.61 2000/04/19 06:50:36 itojun Exp $
+#	$OpenBSD: GENERIC,v 1.37 2005/04/30 00:36:05 deraadt Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
 
 machine 	vax			# machine type; required
 
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index eacbdf27b6b..1a0df0d674c 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,13 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.33 2005/04/15 01:05:50 pascoe Exp $
-#
-# GENERIC machine description file
-#
-# This machine description file is used to generate the default OpenBSD
-# kernel.  The generic kernel does not include all options, subsystems
-# and device drivers, but should be useful for most applications.
-#
-# The machine description file can be customised for your specific
-# machine to reduce the kernel size and improve its performance.
+#	$OpenBSD: GENERIC,v 1.34 2005/04/30 00:36:05 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.