summaryrefslogtreecommitdiff
path: root/sys/arch/hppa
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/hppa
parentd551cf2abc3c5f708c1fd771cd919467d43d25ad (diff)
deraadt says disable bluetooth everywhere else too
Diffstat (limited to 'sys/arch/hppa')
-rw-r--r--sys/arch/hppa/conf/GENERIC21
1 files changed, 10 insertions, 11 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 8eb01fde08b..bbca786f7df 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.144 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: GENERIC,v 1.145 2011/07/07 23:41:09 tedu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -169,16 +169,15 @@ udl* at uhub? # DisplayLink USB displays
wsdisplay* at udl?
# 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?
sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics
sti0 at phantomas0 irq 11 # builtin graphics on BC*