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/amd64/conf/GENERIC | |
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/amd64/conf/GENERIC')
-rw-r--r-- | sys/arch/amd64/conf/GENERIC | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index a6f9cc24c04..780e820a88d 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.312 2011/01/08 11:56:30 damien Exp $ +# $OpenBSD: GENERIC,v 1.313 2011/02/17 20:14:30 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -263,9 +263,9 @@ sdmmc* at sdhc? # SD/MMC bus scsibus* at sdmmc? # SCSI emulation # Bluetooth controllers -sbt* at sdmmc? # SDIO Bluetooth +sbt* at sdmmc? disable # SDIO Bluetooth bthub* at sbt? -ubt* at uhub? # USB Bluetooth +ubt* at uhub? disable # USB Bluetooth bthub* at ubt? bthidev* at bthub? # Bluetooth HID support btkbd* at bthidev? |