diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-08-25 13:03:28 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-08-25 13:03:28 +0000 |
| commit | 8ff45407f406a91d84e3c0f44c27a88e406eca67 (patch) | |
| tree | 587f04792cfc1427d391e6af31c07e0945ccff85 /sys/arch/macppc/conf | |
| parent | 7017776279a1ec23838da5575e8312b270237930 (diff) | |
Disable ehci on macppc for now, it causes a race condition between devices
attached at boot and ehci, can be enabled via UKC. ok deraadt@
Diffstat (limited to 'sys/arch/macppc/conf')
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 113f850a75a..73e96932c14 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.57 2004/07/20 20:41:49 dhartmei Exp $g +# $OpenBSD: GENERIC,v 1.58 2004/08/25 13:03:27 drahn Exp $g # # PPC GENERIC config file # @@ -169,7 +169,7 @@ scsibus* at atapiscsi? # PCI USB Controllers ohci* at pci? # Open Host Controller -ehci* at pci? # Enhanced Host Controller +ehci* at pci? 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 ad1b4defacd..da166bb9771 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.32 2004/08/03 00:45:11 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.33 2004/08/25 13:03:27 drahn Exp $ # # PPC GENERIC config file # @@ -128,7 +128,7 @@ scsibus* at atapiscsi? # PCI USB Controllers ohci* at pci? # Open Host Controller -ehci* at pci? # Enhanced Host Controller +ehci* at pci? disable # Enhanced Host Controller # USB bus support usb* at ohci? flags 0x1 |