summaryrefslogtreecommitdiff
path: root/sys/arch/armish/conf
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/armish/conf
parentd551cf2abc3c5f708c1fd771cd919467d43d25ad (diff)
deraadt says disable bluetooth everywhere else too
Diffstat (limited to 'sys/arch/armish/conf')
-rw-r--r--sys/arch/armish/conf/GENERIC21
1 files changed, 10 insertions, 11 deletions
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 77da2129fbc..5d8a3753cfd 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.41 2011/06/29 20:52:08 matthew Exp $
+# $OpenBSD: GENERIC,v 1.42 2011/07/07 23:41:09 tedu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -160,16 +160,15 @@ uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter
onewire* at uow?
# Bluetooth controllers
-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?
+#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?
amphy* at mii? # AMD 79C873 PHYs
dcphy* at mii? # Digital Clone PHYs