summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2000-10-07 16:52:33 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2000-10-07 16:52:33 +0000
commitab1cf2e011530d7d84f2d53b82a52e0907b024ac (patch)
tree77eb2827b447e8e82db637db4753cf7773d20671 /sys
parentdba85789c14b9caa558999f31f5aa2fb13ea0e86 (diff)
put usb in, but disable the top devices
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/conf/GENERIC42
1 files changed, 21 insertions, 21 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 4b44fed78b0..197e19b4f91 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.208 2000/09/17 05:11:47 aaron Exp $
+# $OpenBSD: GENERIC,v 1.209 2000/10/07 16:52:32 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -78,48 +78,48 @@ cbb* at pci? dev ? function ?
cardslot* at cbb?
# PCI USB Controllers
-#uhci* at pci? # Universal Host Controller (Intel)
-#ohci* at pci? # Open Host Controller
+uhci* at pci? # Universal Host Controller (Intel)
+ohci* at pci? # Open Host Controller
# USB bus support
-#usb* at uhci?
-#usb* at ohci?
+usb* at uhci? disable
+usb* at ohci? disable
# USB Hubs
-#uhub* at usb?
-#uhub* at uhub? port ? configuration ? interface ?
+uhub* at usb?
+uhub* at uhub? port ? configuration ? interface ?
# USB Generic HID devices
-#uhid* at uhub? port ? configuration ? interface ?
+uhid* at uhub? port ? configuration ? interface ?
# USB Printers
-#ulpt* at uhub? port ? configuration ? interface ?
+ulpt* at uhub? port ? configuration ? interface ?
# USB Mass Storage devices
-#umass* at uhub? port ? configuration ? interface ?
-#scsibus* at umass?
+umass* at uhub? port ? configuration ? interface ?
+scsibus* at umass?
# USB Modems
-#umodem* at uhub? port ? configuration ?
-#ucom* at umodem?
+umodem* at uhub? port ? configuration ?
+ucom* at umodem?
# USB Audio
-#uaudio* at uhub? port ? configuration ?
+uaudio* at uhub? port ? configuration ?
# USB Ethernet adapters
-#aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
-#cue* at uhub? port ? # CATC USB-EL1201A based adapters
-#kue* at uhub? port ? # Kawasaki KL5KUSB101B based adapters
+aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
+cue* at uhub? port ? # CATC USB-EL1201A based adapters
+kue* at uhub? port ? # Kawasaki KL5KUSB101B based adapters
# Diamond Multimedia Rio 500
-#urio* at uhub? port ?
+urio* at uhub? port ?
# Handspring Visor
-#uvisor* at uhub? port ? configuration ?
-#ucom* at uvisor?
+uvisor* at uhub? port ? configuration ?
+ucom* at uvisor?
# USB Generic driver
-#ugen* at uhub? port ? configuration ? interface ?
+ugen* at uhub? port ? configuration ? interface ?
puc* at pci? # PCI "universal" communication device