summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorUwe Stuehler <uwe@cvs.openbsd.org>2008-11-26 21:54:21 +0000
committerUwe Stuehler <uwe@cvs.openbsd.org>2008-11-26 21:54:21 +0000
commit7aba786e88e4ab48602d3e5243d7ebc3764b9b0e (patch)
treebddbfb8743478fb52e0e3492c11b6653cf845726 /sys/arch/i386/conf/GENERIC
parent6b70c2bf6263d559aa2a4acad332aa100c4842fd (diff)
Enable Bluetooth (btd and btctl are not hooked into the build yet)
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC24
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a7cec2a8d61..1dfd8ea7e75 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.641 2008/11/24 22:31:19 uwe Exp $
+# $OpenBSD: GENERIC,v 1.642 2008/11/26 21:54:20 uwe Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -294,23 +294,23 @@ sdmmc* at sdhc? # SD/MMC bus
scsibus* at sdmmc? # SCSI emulation
# Bluetooth controllers
-#sbt* at sdmmc? # SDIO Bluetooth
-#ubt* at uhub? # USB Bluetooth
+sbt* at sdmmc? # SDIO Bluetooth
+ubt* at uhub? # USB Bluetooth
# Bluetooth bus support
-#bthub* at sbt?
-#bthub* at ubt?
+bthub* at sbt?
+bthub* at ubt?
# Bluetooth HID support
-#bthidev* at bthub?
-#btkbd* at bthidev?
-#btms* at bthidev?
-#wskbd* at btkbd? mux 1
-#wsmouse* at btms? mux 0
+bthidev* at bthub?
+btkbd* at bthidev?
+btms* at bthidev?
+wskbd* at btkbd? mux 1
+wsmouse* at btms? mux 0
# Bluetooth audio support
-#btsco* at bthub?
-#audio* at btsco?
+btsco* at bthub?
+audio* at btsco?
npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?