remove bthub remnants

10 files changed, 10 insertions, 126 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index c33f34c57a6..cc47b251169 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.243 2014/04/07 22:20:43 andre Exp $
+#	$OpenBSD: GENERIC,v 1.244 2014/07/11 21:58:08 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -133,17 +133,6 @@ utwitch* at uhidev?			# yurex BBU sensor
 uvideo* at uhub?
 video*  at uvideo?
 
-# Bluetooth controllers
-#ubt*	at uhub? disable		# USB Bluetooth
-#bthub*	at ubt?
-#bthidev* at bthub?			# Bluetooth HID support
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
-#btsco*	at bthub?			# Bluetooth audio support
-#audio*	at btsco?
-
 # EV6 Tsunami Core Logic
 tsc*	at	mainbus0
 
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 07cad3b2b09..54e4bd8f26b 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.369 2014/04/20 00:08:26 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.370 2014/07/11 21:58:09 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -274,19 +274,6 @@ sdmmc*	at sdhc?		# SD/MMC bus
 rtsx*	at pci?			# Realtek SD Card Reader
 sdmmc*	at rtsx?		# SD/MMC bus
 
-# Bluetooth controllers
-#sbt*	at sdmmc? disable	# SDIO Bluetooth
-#bthub*	at sbt?
-#ubt*	at uhub? disable	# USB Bluetooth
-#bthub*	at ubt?
-#bthidev* at bthub?		# Bluetooth HID support
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
-#btsco*	at bthub? 		# Bluetooth audio support
-#audio*	at btsco?
-
 isadma0	at isa?
 
 option	WSDISPLAY_COMPAT_USL		# VT handling
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index a12ef72f2ee..a7736ed455f 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.52 2014/04/07 22:20:43 andre Exp $ 
+# $OpenBSD: GENERIC,v 1.53 2014/07/11 21:58:09 tedu Exp $ 
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -163,17 +163,6 @@ utwitch* at uhidev?		# YUREX BBU sensor
 uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
 onewire* at uow?
 
-# Bluetooth controllers
-#ubt*	at uhub? disable	# USB Bluetooth
-#bthub*	at ubt?
-#bthidev* at bthub?		# Bluetooth HID support
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
-#btsco*	at bthub?		# Bluetooth audio support
-#audio*	at btsco?
-
 amphy*		at mii?		# AMD 79C873 PHYs
 dcphy*		at mii?		# Digital Clone PHYs
 exphy*		at mii?		# 3Com internal PHYs
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 99b59b24079..f40c094b5f9 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.163 2014/04/20 00:08:26 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.164 2014/07/11 21:58:09 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -173,17 +173,6 @@ onewire* at uow?
 udl*	at uhub?		# DisplayLink USB displays
 wsdisplay* at udl?
 
-# Bluetooth controllers
-#ubt*	at uhub? disable	# USB Bluetooth
-#bthub*	at ubt?
-#bthidev* at bthub?		# Bluetooth HID support
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
-#btsco*	at bthub?		# Bluetooth audio support
-#audio*	at btsco?
-
 sti0	at mainbus0 irq 11	# [H]CRX-{8,24,48}[Z] graphics
 sti0	at phantomas0 irq 11	# builtin graphics on BC*
 sti0	at uturn? irq 11
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 30e5df039a1..7002ce796b7 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.777 2014/06/22 21:15:51 guenther Exp $
+#	$OpenBSD: GENERIC,v 1.778 2014/07/11 21:58:09 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -329,19 +329,6 @@ sdmmc*	at sdhc?		# SD/MMC bus
 rtsx*	at pci?			# Realtek SD Card Reader
 sdmmc*	at rtsx?		# SD/MMC bus
 
-# Bluetooth controllers
-#sbt*	at sdmmc? disable	# SDIO Bluetooth
-#bthub*	at sbt?
-#ubt*	at uhub? disable	# USB Bluetooth
-#bthub*	at ubt?
-#bthidev* at bthub?		# Bluetooth HID support
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
-#btsco*	at bthub?		# Bluetooth audio support
-#audio*	at btsco?
-
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index fdc4be40a6e..9c5199bd971 100644
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.43 2014/04/07 22:20:43 andre Exp $
+# $OpenBSD: GENERIC,v 1.44 2014/07/11 21:58:09 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -164,17 +164,6 @@ utwitch* at uhidev?		# YUREX BBU sensor
 udl*		at uhub?
 wsdisplay*	at udl?
 
-# Bluetooth controllers
-#ubt*	at uhub? disable	# USB Bluetooth
-#bthub*	at ubt?
-#bthidev* at bthub?		# Bluetooth HID support
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
-#btsco*	at bthub?		# Bluetooth audio support
-#audio*	at btsco?
-
 scsibus* at scsi?
 sd*	at scsibus?			# SCSI disk drives
 cd*	at scsibus?			# SCSI CD-ROM drives
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index 0f8be6bc86e..27ca882898f 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.43 2014/04/07 22:20:43 andre Exp $
+#	$OpenBSD: GENERIC,v 1.44 2014/07/11 21:58:09 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -177,17 +177,6 @@ video*		at uvideo?
 udl*		at uhub?
 wsdisplay*	at udl?
 
-# Bluetooth controllers
-#ubt*	at uhub? disable	# USB Bluetooth
-#bthub*	at ubt?
-#bthidev*	at bthub?		# Bluetooth HID support
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse*	at btms? mux 0
-#btsco*	at bthub?		# Bluetooth audio support
-#audio*	at btsco?
-
 # NICs
 ral*		at pci?
 re*		at pci?
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 3ba036d015a..f496fdc0418 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.235 2014/04/20 00:08:26 dlg Exp $g
+#	$OpenBSD: GENERIC,v 1.236 2014/07/11 21:58:09 tedu Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -303,17 +303,6 @@ video*  at uvideo?
 udl*		at uhub?
 wsdisplay*	at udl?
 
-# Bluetooth controllers
-#ubt*	at uhub? disable	# USB Bluetooth
-#bthub*	at ubt?
-#bthidev* at bthub?		# Bluetooth HID support
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
-#btsco*	at bthub?		# Bluetooth audio support
-#audio*	at btsco?
-
 # I2C bus support
 iic*		at kiic?
 iic*		at piic?
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 854c9e3bb47..8660a043fda 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.286 2014/04/20 00:08:26 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.287 2014/07/11 21:58:09 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -252,17 +252,6 @@ onewire* at uow?
 uvideo* at uhub?
 video*  at uvideo?
 
-# Bluetooth controllers
-#ubt*	at uhub? disable	# USB Bluetooth
-#bthub*	at ubt?
-#bthidev* at bthub?		# Bluetooth HID support
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
-#btsco*	at bthub?		# Bluetooth audio support
-#audio*	at btsco?
-
 # CardBus bus support
 cardbus* at cardslot?
 pcmcia*	at cardslot?
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 894a31ecad9..28154ae2d12 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.93 2014/04/08 02:25:33 brad Exp $
+#	$OpenBSD: GENERIC,v 1.94 2014/07/11 21:58:09 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -207,19 +207,6 @@ flash0		at pxaip?		# NAND flash memory
 pxammc0		at pxaip?		# MMC/SD/SDIO controller
 sdmmc*		at pxammc?		# SD/MMC bus
 
-# Bluetooth controllers
-#sbt*	at sdmmc? disable		# SDIO Bluetooth
-#bthub*	at sbt?
-#ubt*	at uhub? disable		# USB Bluetooth
-#bthub*	at ubt?
-#bthidev* at bthub?			# Bluetooth HID support
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
-#btsco*	at bthub?			# Bluetooth audio support
-#audio*	at btsco?
-
 # USB Video
 uvideo* at uhub?
 video*  at uvideo?