summaryrefslogtreecommitdiff
path: root/sys/arch/macppc
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2011-02-17 20:14:31 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2011-02-17 20:14:31 +0000
commitcceacd4c79cae4b54873c27059ba25680e8eb00f (patch)
treea0bf431d24a5ea1450d7a19dc46e29d5a4b947ce /sys/arch/macppc
parent2e37b816c21981c412db45b5cfbcf4367972d249 (diff)
Disable sbt and ubt devices. The bluetooth code will sometimes sleep while
holding locks, this is not allowed, and nobody has stepped up to fix this, so better not lure people into using bluetooth devices.
Diffstat (limited to 'sys/arch/macppc')
-rw-r--r--sys/arch/macppc/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index b5ff6e0d749..835f2d1fd4d 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.205 2011/01/08 11:56:30 damien Exp $g
+# $OpenBSD: GENERIC,v 1.206 2011/02/17 20:14:30 miod Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -316,7 +316,7 @@ udl* at uhub?
wsdisplay* at udl?
# Bluetooth controllers
-ubt* at uhub? # USB Bluetooth
+ubt* at uhub? disable # USB Bluetooth
bthub* at ubt?
bthidev* at bthub? # Bluetooth HID support