summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-11-29 21:24:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-11-29 21:24:27 +0000
commit8f33d6b5cb9859e1feab9d4c00e915db2ce1d2cc (patch)
treed28c4644be3404497da8185b383d0dc415a7724f /sys
parentc02327466c9a22bbc79915d511a32897506fd5ad (diff)
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....
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
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