summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2011-07-07 23:36:42 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2011-07-07 23:36:42 +0000
commitd551cf2abc3c5f708c1fd771cd919467d43d25ad (patch)
treeeafd779fe822eb86d07c8567406159e7ed11c252 /sys/arch/i386/conf
parent3468906847d42b09edb0102799f9607cce0b3440 (diff)
We cannot allow the past to impede future progress. So disable bluetooth
to free up some more room for isadma. ok deraadt
Diffstat (limited to 'sys/arch/i386/conf')
-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 cbc761ab8fe..8e313299179 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.725 2011/07/07 22:45:08 tedu Exp $
+# $OpenBSD: GENERIC,v 1.726 2011/07/07 23:36:41 tedu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -317,17 +317,17 @@ sdhc* at pci? # SD Host Controller
sdmmc* at sdhc? # 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?
+#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?