summaryrefslogtreecommitdiff
path: root/sys/arch/palm
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2011-07-07 23:41:10 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2011-07-07 23:41:10 +0000
commitf13884981a67ed7d87352c2dd4950c71bb16a7f4 (patch)
treeae16c5864937d4ef61287d77a2fa7fc4eb8cef45 /sys/arch/palm
parentd551cf2abc3c5f708c1fd771cd919467d43d25ad (diff)
deraadt says disable bluetooth everywhere else too
Diffstat (limited to 'sys/arch/palm')
-rw-r--r--sys/arch/palm/conf/GENERIC26
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC
index 923818915ec..73892e1102c 100644
--- a/sys/arch/palm/conf/GENERIC
+++ b/sys/arch/palm/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.12 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: GENERIC,v 1.13 2011/07/07 23:41:09 tedu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -193,23 +193,23 @@ pxammc0 at pxaip? addr 0x41100000 # MMC/SD/SDIO controller
sdmmc* at pxammc? # SD/MMC bus
# Bluetooth controllers
-sbt* at sdmmc? disable # SDIO Bluetooth
-bthub* at sbt?
-ubt* at uhub? disable # USB Bluetooth
-bthub* at ubt?
+#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?
+
# USB Video
uvideo* at uhub?
video* at uvideo?
-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?
-
# 1-Wire devices
option ONEWIREVERBOSE
owid* at onewire? # ID