summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-05-23 03:23:02 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-05-23 03:23:02 +0000
commit919eeefecc1cb34d2918ba0ee1c3624a9f326def (patch)
treef7f71bbb26ba66851279c2e98da8ff38cf9bea6b /sys/arch/i386
parent9a602279ea7954459111471ffe3834823a8b9685 (diff)
ehci support; hacked into working shape by jonathon@gateway.zenbu.net
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 2bdf3234bf0..fefeaa95437 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.360 2004/05/11 04:01:00 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.361 2004/05/23 03:23:00 deraadt Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -100,10 +100,12 @@ cbb* at pci? dev ? function ?
cardslot* at cbb?
# PCI USB Controllers
+ehci* at pci? # Enhanced Host Controller
uhci* at pci? # Universal Host Controller (Intel)
ohci* at pci? # Open Host Controller
# USB bus support
+usb* at ehci?
usb* at uhci?
usb* at ohci?
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index ca8be04a0c0..3d65ade5fd9 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.69 2004/05/08 05:11:00 grange Exp $
+# $OpenBSD: RAMDISK_CD,v 1.70 2004/05/23 03:23:00 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -79,10 +79,12 @@ pcic* at pci? dev? function ?
pcmcia* at pcic? controller ? socket ?
# PCI USB Controllers
+ehci* at pci? # Enhanced Host Controller
uhci* at pci? # Universal Host Controller (Intel)
ohci* at pci? # Open Host Controller
# USB bus support
+usb* at ehci?
usb* at uhci?
usb* at ohci?