summaryrefslogtreecommitdiff
path: root/sys/arch/hppa
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/hppa
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/hppa')
-rw-r--r--sys/arch/hppa/conf/GENERIC4
-rw-r--r--sys/arch/hppa/conf/RAMDISK4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 7920f1400a1..2e9a5f9f68e 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.141 2011/01/02 14:01:18 matthieu Exp $
+# $OpenBSD: GENERIC,v 1.142 2011/02/17 20:14:30 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -171,7 +171,7 @@ udl* at uhub? # DisplayLink USB displays
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
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index 7cb5c2e6a6a..a48f0353eeb 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.90 2010/07/03 03:59:16 krw Exp $
+# $OpenBSD: RAMDISK,v 1.91 2011/02/17 20:14:30 miod Exp $
#
# Diskless kernel config
#
@@ -157,7 +157,7 @@ wi* at uhub? # WaveLAN IEEE 802.11DS
#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
+#ubt* at uhub? disable # USB Bluetooth
#ugen* at uhub? # USB Generic driver
ural* at uhub? # Ralink RT2500