diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2004-12-08 08:05:45 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2004-12-08 08:05:45 +0000 |
| commit | 22906c768e21d33b937ea1ffbe0abaa2b29299eb (patch) | |
| tree | 61b5eeeb8e5131f28229883211199354aaab683e /sys/arch/amd64 | |
| parent | bd053aaf2d07e61d3d88b6cf34f347be32bb137d (diff) | |
add ohci and ehci at cardbus to amd64, i386 and macppc. amd64 remains
disabled for now.
from deraadt@
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 6 |
2 files changed, 8 insertions, 4 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? |