summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2009-11-26 13:35:53 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2009-11-26 13:35:53 +0000
commit8bca6e9896c0cb906b457e4f4b5ac6a8b8b6a67a (patch)
tree1cbc7f260a4e521609c7c948a3a694524d769c5e /sys
parent8b81db810c2e77eac245b19ef9e769ce869ab04e (diff)
wdc@isa ok deraadt
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8dfaddaaa96..4a536d951c6 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.278 2009/11/24 08:19:27 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.279 2009/11/26 13:35:52 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -391,6 +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
wdc* at pcmcia?
# IDE hard drives
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 1519192bdc7..6a8b03f3963 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.107 2009/11/15 01:36:11 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.108 2009/11/26 13:35:52 jsg Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -229,6 +229,8 @@ cd* at scsibus? # SCSI CD-ROM drives
# 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
wdc* at pcmcia?
# IDE hard drives