terse is good, more readable; please commit deraadt@

10 files changed, 33 insertions, 82 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index c31c722df7b..71174c1a121 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.205 2008/11/26 21:54:20 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.206 2008/12/01 23:48:46 todd Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -133,19 +133,14 @@ video*  at uvideo?
 
 # Bluetooth controllers
 ubt*	at uhub?			# USB Bluetooth
-
-# Bluetooth bus support
 bthub*	at ubt?
 
-# Bluetooth HID support
-bthidev* at bthub?
+bthidev* at bthub?			# Bluetooth HID support
 btkbd*	at bthidev?
 btms*	at bthidev?
 wskbd*	at btkbd? mux 1
 wsmouse* at btms? mux 0
-
-# Bluetooth audio support
-btsco*	at bthub?
+btsco*	at bthub?			# Bluetooth audio support
 audio*	at btsco?
 
 # EV6 Tsunami Core Logic
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8a6b9db132e..a9304f94916 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.249 2008/11/26 21:54:20 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.250 2008/12/01 23:48:46 todd Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -232,21 +232,15 @@ scsibus* at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
 sbt*	at sdmmc?		# SDIO Bluetooth
-ubt*	at uhub?		# USB Bluetooth
-
-# Bluetooth bus support
 bthub*	at sbt?
+ubt*	at uhub?		# USB Bluetooth
 bthub*	at ubt?
-
-# Bluetooth HID support
-bthidev* at bthub?
+bthidev* at bthub?		# Bluetooth HID support
 btkbd*	at bthidev?
 btms*	at bthidev?
 wskbd*	at btkbd? mux 1
 wsmouse* at btms? mux 0
-
-# Bluetooth audio support
-btsco*	at bthub?
+btsco*	at bthub? 		# Bluetooth audio support
 audio*	at btsco?
 
 isadma0	at isa?
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index beebf46ff7e..28e77b83895 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.23 2008/11/26 21:54:20 uwe Exp $ 
+# $OpenBSD: GENERIC,v 1.24 2008/12/01 23:48:46 todd Exp $ 
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -156,19 +156,14 @@ onewire* at uow?
 
 # Bluetooth controllers
 ubt*	at uhub?		# USB Bluetooth
-
-# Bluetooth bus support
 bthub*	at ubt?
 
-# Bluetooth HID support
-bthidev* at bthub?
+bthidev* at bthub?		# Bluetooth HID support
 btkbd*	at bthidev?
 btms*	at bthidev?
 wskbd*	at btkbd? mux 1
 wsmouse* at btms? mux 0
-
-# Bluetooth audio support
-btsco*	at bthub?
+btsco*	at bthub?		# Bluetooth audio support
 audio*	at btsco?
 
 amphy*		at mii?		# AMD 79C873 PHYs
diff --git a/sys/arch/gumstix/conf/GENERIC b/sys/arch/gumstix/conf/GENERIC
index 762b6aef40d..bde8bc5a05b 100644
--- a/sys/arch/gumstix/conf/GENERIC
+++ b/sys/arch/gumstix/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.2 2008/11/26 21:59:12 matthieu Exp $
+#	$OpenBSD: GENERIC,v 1.3 2008/12/01 23:48:46 todd Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -211,14 +211,11 @@ ukphy*	at mii?				# "unknown" PHYs
 
 # Bluetooth controllers
 #sbt*	at sdmmc?			# SDIO Bluetooth
-#ubt*	at uhub?			# USB Bluetooth
-
-# Bluetooth bus support
 #bthub*	at sbt?
+#ubt*	at uhub?			# USB Bluetooth
 #bthub*	at ubt?
 
-# Bluetooth HID support
-#bthidev* at bthub?
+#bthidev* at bthub?			# Bluetooth HID support
 #btkbd*	at bthidev?
 #btms*	at bthidev?
 #wskbd*	at btkbd? mux 1
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index a7498a8dbcf..189dd5e1e39 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.122 2008/11/26 21:54:20 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.123 2008/12/01 23:48:46 todd Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -173,19 +173,14 @@ onewire* at uow?
 
 # Bluetooth controllers
 ubt*	at uhub?		# USB Bluetooth
-
-# Bluetooth bus support
 bthub*	at ubt?
 
-# Bluetooth HID support
-bthidev* at bthub?
+bthidev* at bthub?		# Bluetooth HID support
 btkbd*	at bthidev?
 btms*	at bthidev?
 wskbd*	at btkbd? mux 1
 wsmouse* at btms? mux 0
-
-# Bluetooth audio support
-btsco*	at bthub?
+btsco*	at bthub?		# Bluetooth audio support
 audio*	at btsco?
 
 sti0	at mainbus0 irq 11	# [H]CRX-{8,24,48}[Z] graphics
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 9121b76c35e..8165d129ae0 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.643 2008/11/27 11:36:04 mbalmer Exp $
+#	$OpenBSD: GENERIC,v 1.644 2008/12/01 23:48:46 todd Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -295,21 +295,16 @@ scsibus* at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
 sbt*	at sdmmc?		# SDIO Bluetooth
-ubt*	at uhub?		# USB Bluetooth
-
-# Bluetooth bus support
 bthub*	at sbt?
+ubt*	at uhub?		# USB Bluetooth
 bthub*	at ubt?
 
-# Bluetooth HID support
-bthidev* at bthub?
+bthidev* at bthub?		# Bluetooth HID support
 btkbd*	at bthidev?
 btms*	at bthidev?
 wskbd*	at btkbd? mux 1
 wsmouse* at btms? mux 0
-
-# Bluetooth audio support
-btsco*	at bthub?
+btsco*	at bthub?		# Bluetooth audio support
 audio*	at btsco?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index 80be32806b7..f58c27c02aa 100644
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.19 2008/11/30 19:20:50 maja Exp $
+# $OpenBSD: GENERIC,v 1.20 2008/12/01 23:48:46 todd Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -159,19 +159,14 @@ udcf*	at uhub?		# Gude Expert mouseCLOCK
 
 # Bluetooth controllers
 ubt*	at uhub?		# USB Bluetooth
-
-# Bluetooth bus support
 bthub*	at ubt?
 
-# Bluetooth HID support
-bthidev* at bthub?
+bthidev* at bthub?		# Bluetooth HID support
 #btkbd*	at bthidev?
 #btms*	at bthidev?
 #wskbd*	at btkbd? mux 1
 #wsmouse* at btms? mux 0
-
-# Bluetooth audio support
-btsco*	at bthub?
+btsco*	at bthub?		# Bluetooth audio support
 audio*	at btsco?
 
 sd*	at scsibus?			# SCSI disk drives
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index bacad622569..c88c0b402b9 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.185 2008/11/26 21:54:20 uwe Exp $g
+#	$OpenBSD: GENERIC,v 1.186 2008/12/01 23:48:47 todd Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -296,19 +296,14 @@ video*  at uvideo?
 
 # Bluetooth controllers
 ubt*	at uhub?		# USB Bluetooth
-
-# Bluetooth bus support
 bthub*	at ubt?
 
-# Bluetooth HID support
-bthidev* at bthub?
+bthidev* at bthub?		# Bluetooth HID support
 btkbd*	at bthidev?
 btms*	at bthidev?
 wskbd*	at btkbd? mux 1
 wsmouse* at btms? mux 0
-
-# Bluetooth audio support
-btsco*	at bthub?
+btsco*	at bthub?		# Bluetooth audio support
 audio*	at btsco?
 
 # I2C bus support
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 841f09b4226..ff579171cdb 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.224 2008/11/26 21:54:20 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.225 2008/12/01 23:48:47 todd Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -248,19 +248,14 @@ video*  at uvideo?
 
 # Bluetooth controllers
 ubt*	at uhub?		# USB Bluetooth
-
-# Bluetooth bus support
 bthub*	at ubt?
 
-# Bluetooth HID support
-bthidev* at bthub?
+bthidev* at bthub?		# Bluetooth HID support
 btkbd*	at bthidev?
 btms*	at bthidev?
 wskbd*	at btkbd? mux 1
 wsmouse* at btms? mux 0
-
-# Bluetooth audio support
-btsco*	at bthub?
+btsco*	at bthub?		# Bluetooth audio support
 audio*	at btsco?
 
 # CardBus bus support
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 38337950aec..4ddd4f7abf3 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.70 2008/11/26 21:54:20 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.71 2008/12/01 23:48:47 todd Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -211,21 +211,16 @@ scsibus*	at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
 sbt*	at sdmmc?			# SDIO Bluetooth
-ubt*	at uhub?			# USB Bluetooth
-
-# Bluetooth bus support
 bthub*	at sbt?
+ubt*	at uhub?			# USB Bluetooth
 bthub*	at ubt?
 
-# Bluetooth HID support
-bthidev* at bthub?
+bthidev* at bthub?			# Bluetooth HID support
 btkbd*	at bthidev?
 btms*	at bthidev?
 wskbd*	at btkbd? mux 1
 wsmouse* at btms? mux 0
-
-# Bluetooth audio support
-btsco*	at bthub?
+btsco*	at bthub?			# Bluetooth audio support
 audio*	at btsco?
 
 # 1-Wire devices