diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2011-02-17 20:14:31 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2011-02-17 20:14:31 +0000 |
| commit | cceacd4c79cae4b54873c27059ba25680e8eb00f (patch) | |
| tree | a0bf431d24a5ea1450d7a19dc46e29d5a4b947ce /sys/arch/armish | |
| parent | 2e37b816c21981c412db45b5cfbcf4367972d249 (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/armish')
| -rw-r--r-- | sys/arch/armish/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/armish/conf/RAMDISK | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC index 70cdabf0f98..f18620cbf9a 100644 --- a/sys/arch/armish/conf/GENERIC +++ b/sys/arch/armish/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.38 2011/01/08 11:56:30 damien Exp $ +# $OpenBSD: GENERIC,v 1.39 2011/02/17 20:14:30 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -162,7 +162,7 @@ uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? # 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/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK index be62e850370..4167c21d8c9 100644 --- a/sys/arch/armish/conf/RAMDISK +++ b/sys/arch/armish/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.16 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: RAMDISK,v 1.17 2011/02/17 20:14:30 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -139,7 +139,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 #udcf* at uhub? # Gude Expert mouseCLOCK |