diff options
Diffstat (limited to 'sys/arch/macppc')
-rw-r--r-- | sys/arch/macppc/conf/GENERIC | 6 | ||||
-rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 6 |
2 files changed, 8 insertions, 4 deletions
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 |