summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2004-05-23 04:03:58 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2004-05-23 04:03:58 +0000
commit7bfbf8507960fd0c8240867b03979b81a70a4f17 (patch)
treeecb6f42cbb4694349a7be4fa03d9b78f833c8d93
parent83e58bb200ad70ca57929b813165151233a1db56 (diff)
Enable ehci on amd64 also. ok deraadt@ pval@
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 7ef68ff27f8..947d7cb9e24 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.15 2004/05/10 20:18:10 marc Exp $
+# $OpenBSD: GENERIC,v 1.16 2004/05/23 04:03:57 drahn Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -80,10 +80,12 @@ viaenv* at pci? dev ? function ? # VIA VT82C686A hardware monitor
#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/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index f878466acc8..191d3e4c097 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.7 2004/03/12 01:36:58 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.8 2004/05/23 04:03:57 drahn Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -59,10 +59,12 @@ pci* at pchb? bus ?
#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?