diff options
| author |   jsg <jsg@openbsd.org> | 2009-11-26 13:35:52 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2009-11-26 13:35:52 +0000 |
| commit | aeac1b07e26865df28c76f7820a6a0b965b2c516 (patch) | |
| tree | 12f7373b85ae5f03dd8141adea01e59e4f1edb58 | |
| parent | Toggle into "cold" when we we disable interrupts, because tsleeping (diff) | |
| download | wireguard-openbsd-aeac1b07e26865df28c76f7820a6a0b965b2c516.tar.xz wireguard-openbsd-aeac1b07e26865df28c76f7820a6a0b965b2c516.zip | |
wdc@isa ok deraadt
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 4 |
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 |