summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-10-13 14:43:37 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-10-13 14:43:37 +0000
commitccfc4626e5c9dc3dae5e629b4c2cbe78a4f3ca84 (patch)
tree0b6136c51b1fd739870d97446d10cedcff924240 /sys/arch/i386
parent88b5352053c86aeb043f12d8ff15e6003604b63e (diff)
Disable the actual USB controllers instead of the usb attachments by default.
The problem is that some systems come with a USB mouse and keyboard but their BIOS emulates a regular AT keyboard and PS/2 mouse. When the BIOS notices the uhci or ohci are being touched, it stops emulating. deraadt@ ok.
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 197e19b4f91..bf4bdfd90cb 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.209 2000/10/07 16:52:32 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.210 2000/10/13 14:43:36 aaron Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -78,12 +78,12 @@ 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? disable # Universal Host Controller (Intel)
+ohci* at pci? disable # Open Host Controller
# USB bus support
-usb* at uhci? disable
-usb* at ohci? disable
+usb* at uhci?
+usb* at ohci?
# USB Hubs
uhub* at usb?