summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf/GENERIC
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amd64/conf/GENERIC')
-rw-r--r--sys/arch/amd64/conf/GENERIC11
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 61d74f3be76..ba40672ae35 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.186 2007/05/28 22:26:03 todd Exp $
+# $OpenBSD: GENERIC,v 1.187 2007/05/31 23:18:25 uwe Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -192,7 +192,6 @@ scsibus* at usscanner?
#uyap* at uhub? # Y@P firmware loader
udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
-#ubt* at uhub? # USB Bluetooth
uberry* at uhub? # Research In Motion Blackberry
ugen* at uhub? # USB Generic driver
uath* at uhub? # Atheros AR5005UG/AR5005UX
@@ -210,6 +209,14 @@ sdhc* at pci? # SD Host Controller
sdmmc* at sdhc? # SD/MMC bus
scsibus* at sdmmc? # SCSI emulation
+# Bluetooth controllers
+#sbt* at sdmmc? # SDIO Bluetooth
+#ubt* at uhub? # USB Bluetooth
+
+# Bluetooth bus support
+#bthub* at sbt?
+#bthub* at ubt?
+
isadma0 at isa?
option WSDISPLAY_COMPAT_USL # VT handling