summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-08-19 06:55:31 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-08-19 06:55:31 +0000
commitc0444ab9407e1efea35f05ebc49caed4f50bf3c8 (patch)
treee90feb06a2c62a350c52540d171c31ce9c057c1d
parent73353a64d2f018d91ad59d83432a89c8c91b0017 (diff)
undo damage aaron did
-rw-r--r--sys/arch/i386/conf/GENERIC20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 38515e9d74b..d4d0b7ce990 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.124 1999/08/14 17:29:23 aaron Exp $
+# $OpenBSD: GENERIC,v 1.125 1999/08/19 06:55:30 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -47,7 +47,7 @@ pci* at mainbus0 bus ?
option PCIVERBOSE
option EISAVERBOSE
#option PCMCIAVERBOSE
-option USBVERBOSE
+#option USBVERBOSE
pchb* at pci? dev ? function ? # PCI-Host bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
@@ -63,22 +63,22 @@ pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
pcmcia* at pcic? controller ? socket ?
# 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?
+#usb* at ohci?
# 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 Generic driver
-ugen* at uhub? port ? configuration ? interface ?
+#ugen* at uhub? port ? configuration ? interface ?
npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?