diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-01-03 21:45:19 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-01-03 21:45:19 +0000 |
| commit | ea2bb7f0ee2b61228f75e36935e3e5aabf313960 (patch) | |
| tree | 4fef3947a1303ff858a040f4049c0c4e74e1ad7c | |
| parent | a721cb8e1f87f04abf62129992df6a7a189d7958 (diff) | |
re-enable ohci and uhci
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISKBIG | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index c19ecd1b781..fa4708df093 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.136 2004/12/30 08:05:04 jsg Exp $ +# $OpenBSD: GENERIC,v 1.137 2005/01/03 21:45:18 deraadt Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ machine alpha @@ -50,8 +50,8 @@ mainbus0 at root cpu* at mainbus0 # PCI USB Controllers -uhci* at pci? disable # Universal Host Controller (Intel) -ohci* at pci? disable # Open Host Controller +uhci* at pci? # Universal Host Controller (Intel) +ohci* at pci? # Open Host Controller # USB bus support usb* at uhci? @@ -351,3 +351,4 @@ hifn* at pci? # Hi/fn 7751 crypto card pseudo-device crypto 1 pseudo-device sequencer 1 #pseudo-device hotplug 1 # devices hot plugging +#pseudo-device wsmux 2 diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index 8cafcd7b6e0..ef38f4a2588 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKBIG,v 1.46 2004/12/30 08:05:05 jsg Exp $ +# $OpenBSD: RAMDISKBIG,v 1.47 2005/01/03 21:45:18 deraadt Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -51,8 +51,8 @@ mainbus0 at root cpu* at mainbus0 # PCI USB Controllers -uhci* at pci? disable # Universal Host Controller (Intel) -ohci* at pci? disable # Open Host Controller +uhci* at pci? # Universal Host Controller (Intel) +ohci* at pci? # Open Host Controller # USB bus support usb* at uhci? @@ -297,3 +297,4 @@ wsmouse* at pms? pseudo-device bpfilter 1 pseudo-device loop pseudo-device rd 1 +#pseudo-device wsmux 2 |