From 22906c768e21d33b937ea1ffbe0abaa2b29299eb Mon Sep 17 00:00:00 2001
From: David Gwynne <dlg@cvs.openbsd.org>
Date: Wed, 8 Dec 2004 08:05:45 +0000
Subject: add ohci and ehci at cardbus to amd64, i386 and macppc. amd64 remains
 disabled for now.

from deraadt@
---
 sys/arch/amd64/conf/GENERIC | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sys/arch/amd64/conf/GENERIC')

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index a1beffb01cc..eff90b0391c 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.38 2004/12/06 20:32:29 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.39 2004/12/08 08:05:44 dlg Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -72,10 +72,12 @@ viaenv*	at pci?			# VIA VT82C686A hardware monitor
 #cbb*		at pci?
 #cardslot*	at cbb?
 
-# PCI USB Controllers
+# USB Controllers
 ehci*	at pci?			# Enhanced Host Controller
+#ehci*	at cardbus?		# Enhanced Host Controller
 uhci*	at pci?			# Universal Host Controller (Intel)
 ohci*	at pci?			# Open Host Controller
+#ohci*	at cardbus?		# Open Host Controller
 
 # USB bus support
 usb*	at ehci?
-- 
cgit v1.2.3