diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2011-07-07 23:41:10 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2011-07-07 23:41:10 +0000 |
| commit | f13884981a67ed7d87352c2dd4950c71bb16a7f4 (patch) | |
| tree | ae16c5864937d4ef61287d77a2fa7fc4eb8cef45 /sys/arch/amd64 | |
| parent | d551cf2abc3c5f708c1fd771cd919467d43d25ad (diff) | |
deraadt says disable bluetooth everywhere else too
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index c2bfe2e8d2a..40f16b8bc31 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.323 2011/07/03 21:40:24 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.324 2011/07/07 23:41:09 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -261,17 +261,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? isadma0 at isa? |