summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2008-12-01 23:48:48 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2008-12-01 23:48:48 +0000
commit52765c13a07693703d36b045d1047b56ec5b0c08 (patch)
tree371a461269378a9b955484dc95c39e5c3f9a8486 /sys/arch/i386/conf
parent32ca017e673ec0a66d47d28c0a68092ecc087cb3 (diff)
terse is good, more readable; please commit deraadt@
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 9121b76c35e..8165d129ae0 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.643 2008/11/27 11:36:04 mbalmer Exp $
+# $OpenBSD: GENERIC,v 1.644 2008/12/01 23:48:46 todd Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -295,21 +295,16 @@ scsibus* at sdmmc? # SCSI emulation
# Bluetooth controllers
sbt* at sdmmc? # SDIO Bluetooth
-ubt* at uhub? # USB Bluetooth
-
-# Bluetooth bus support
bthub* at sbt?
+ubt* at uhub? # USB Bluetooth
bthub* at ubt?
-# Bluetooth HID support
-bthidev* at bthub?
+bthidev* at bthub? # Bluetooth HID support
btkbd* at bthidev?
btms* at bthidev?
wskbd* at btkbd? mux 1
wsmouse* at btms? mux 0
-
-# Bluetooth audio support
-btsco* at bthub?
+btsco* at bthub? # Bluetooth audio support
audio* at btsco?
npx0 at isa? port 0xf0 irq 13 # math coprocessor