summaryrefslogtreecommitdiff
path: root/sys/dev/cardbus/files.cardbus
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2004-12-07 05:42:42 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2004-12-07 05:42:42 +0000
commitbc0b21e8e8a22573eb641a737e46ee710e549f51 (patch)
tree8f5e2c087cc4579644868588c0371fcbbd322000 /sys/dev/cardbus/files.cardbus
parent19f9c903fc2760f22631be7691d1815e98dca223 (diff)
ohci and ehci at cardbus support from netbsd
this relies on a fix to kthreads that is not yet committed, so it wont be enabled for now. my boss said it was ok to commit this while im at work. ok deraadt@ drahn@.
Diffstat (limited to 'sys/dev/cardbus/files.cardbus')
-rw-r--r--sys/dev/cardbus/files.cardbus12
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/cardbus/files.cardbus b/sys/dev/cardbus/files.cardbus
index 5f93b5ca5a8..0e81f33461c 100644
--- a/sys/dev/cardbus/files.cardbus
+++ b/sys/dev/cardbus/files.cardbus
@@ -1,4 +1,4 @@
-# $OpenBSD: files.cardbus,v 1.10 2004/11/20 20:07:54 brad Exp $
+# $OpenBSD: files.cardbus,v 1.11 2004/12/07 05:42:41 dlg Exp $
# $NetBSD: files.cardbus,v 1.8 2000/01/26 06:37:24 thorpej Exp $
#
# files.cardbus
@@ -62,10 +62,16 @@ attach atw at cardbus with atw_cardbus
file dev/cardbus/if_atw_cardbus.c atw_cardbus
#
+# EHCI USB controller
+#
+attach ehci at cardbus with ehci_cardbus
+file dev/cardbus/ehci_cardbus.c ehci_cardbus needs-flag
+
+#
# OHCI USB controller
#
-#attach ohci at cardbus with ohci_cardbus
-#file dev/cardbus/ohci_cardbus.c ohci_cardbus
+attach ohci at cardbus with ohci_cardbus
+file dev/cardbus/ohci_cardbus.c ohci_cardbus
#
# Adaptec ADP-1480 SCSI controller