From 8f33d6b5cb9859e1feab9d4c00e915db2ce1d2cc Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Sun, 29 Nov 2009 21:24:27 +0000 Subject: disable the isa wdc's because amd64 machines are much more likely to be legacy-free machines built by Dell monkeys who then (it seems) reuse the io address space for something else. Touch it, and the machine resets. Great.... --- sys/arch/amd64/conf/GENERIC | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/arch/amd64') diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 4a536d951c6..2fcc0ec75a8 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.279 2009/11/26 13:35:52 jsg Exp $ +# $OpenBSD: GENERIC,v 1.280 2009/11/29 21:24:26 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -391,8 +391,8 @@ fd* at fdc? flags 0x00 # IDE controllers pciide* at pci? flags 0x0000 -wdc0 at isa? port 0x1f0 irq 14 flags 0x00 -wdc1 at isa? port 0x170 irq 15 flags 0x00 +wdc0 at isa? disable port 0x1f0 irq 14 flags 0x00 +wdc1 at isa? disable port 0x170 irq 15 flags 0x00 wdc* at pcmcia? # IDE hard drives -- cgit v1.2.3