add ohci and ehci at cardbus to amd64, i386 and macppc. amd64 remains

disabled for now.

from deraadt@

6 files changed, 24 insertions, 12 deletions

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?
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index a8dcf4962a8..15d39954d27 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.20 2004/11/03 08:29:30 xsa Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.21 2004/12/08 08:05:44 dlg Exp $
 
 machine		amd64		# architecture, used by config; REQUIRED
 
@@ -58,10 +58,12 @@ pci*	at pchb?
 # PCMCIA bus support
 #pcmcia*	at pcic?
 
-# 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?
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 345a45f5c34..5c21002d1fd 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.388 2004/12/01 01:29:00 pvalchev Exp $
+#	$OpenBSD: GENERIC,v 1.389 2004/12/08 08:05:44 dlg Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -113,10 +113,12 @@ pcmcia*		at cardslot?
 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?
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 29bffb1ed5e..dfb8cd6a907 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.83 2004/11/25 22:02:08 deraadt Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.84 2004/12/08 08:05:44 dlg Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -84,10 +84,12 @@ pcic*	at pci?
 # PCMCIA bus support
 pcmcia*	at pcic?
 
-# 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?
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 5b33cea64eb..b3fc7db32b9 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.62 2004/11/12 18:07:42 deraadt Exp $g
+#	$OpenBSD: GENERIC,v 1.63 2004/12/08 08:05:44 dlg Exp $g
 #
 # PPC GENERIC config file
 #
@@ -166,9 +166,11 @@ atapiscsi*	at wdc? flags 0x0000
 atapiscsi*	at pciide? flags 0x0000
 scsibus*	at atapiscsi?
 
-# PCI USB Controllers
+# USB Controllers
 ohci*		at pci?		# Open Host Controller
+ohci*		at cardbus?	# Open Host Controller
 ehci*		at pci? disable	# Enhanced Host Controller
+ehci*		at cardbus? disable # Enhanced Host Controller
 
 # USB bus support
 usb*		at ohci? flags 0x1
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index 5df8eb62154..cdf87bfd958 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.36 2004/10/05 02:01:18 jsg Exp $
+#	$OpenBSD: RAMDISK,v 1.37 2004/12/08 08:05:44 dlg Exp $
 #
 # PPC GENERIC config file
 #
@@ -127,9 +127,11 @@ atapiscsi*	at wdc? flags 0x0000
 atapiscsi*	at pciide? flags 0x0000
 scsibus*	at atapiscsi?
 
-# PCI USB Controllers
+# USB Controllers
 ohci*		at pci?		# Open Host Controller
+ohci*		at cardbus?	# Open Host Controller
 ehci*		at pci?	disable	# Enhanced Host Controller
+ehci*		at cardbus? disable # Enhanced Host Controller
 
 # USB bus support
 usb*		at ohci?	flags 0x1