summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/conf/GENERIC4
-rw-r--r--sys/conf/NOTES4
-rw-r--r--sys/i386/conf/GENERIC4
-rw-r--r--sys/i386/conf/LINT4
-rw-r--r--sys/i386/conf/NOTES4
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index e25e158ff026..d0d1a33c421c 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -1,7 +1,7 @@
#
# GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
#
-# $Id: GENERIC,v 1.46 1995/06/11 19:31:11 rgrimes Exp $
+# $Id: GENERIC,v 1.47 1995/08/18 11:26:16 jkh Exp $
#
machine "i386"
@@ -69,7 +69,7 @@ device wt0 at isa? port 0x300 bio irq 5 drq 1 vector wtintr
device mcd0 at isa? port 0x300 bio irq 10 vector mcdintr
device mcd1 at isa? port 0x340 bio irq 11 vector mcdintr
-controller matcd0 at isa? port ? bio
+controller matcd0 at isa? port 0x230 bio
device scd0 at isa? port 0x230 bio
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 4acad504dcb3..ae502aaa0e6d 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.204 1995/10/03 01:12:59 jkh Exp $
+# $Id: LINT,v 1.205 1995/10/10 04:03:12 bde Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -722,7 +722,7 @@ device mcd0 at isa? port 0x300 bio irq 10 vector mcdintr
# for the Sony CDU31/33A CDROM
device scd0 at isa? port 0x230 bio
# for the soundblaster 16 multicd - up to 4 devices
-controller matcd0 at isa? port ? bio
+controller matcd0 at isa? port 0x230 bio
device wt0 at isa? port 0x300 bio irq 5 drq 1 vector wtintr
device ctx0 at isa? port 0x230 iomem 0xd0000
device spigot0 at isa? port 0xad6 irq 15 iomem 0xee000 vector spigintr
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index e25e158ff026..d0d1a33c421c 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,7 +1,7 @@
#
# GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
#
-# $Id: GENERIC,v 1.46 1995/06/11 19:31:11 rgrimes Exp $
+# $Id: GENERIC,v 1.47 1995/08/18 11:26:16 jkh Exp $
#
machine "i386"
@@ -69,7 +69,7 @@ device wt0 at isa? port 0x300 bio irq 5 drq 1 vector wtintr
device mcd0 at isa? port 0x300 bio irq 10 vector mcdintr
device mcd1 at isa? port 0x340 bio irq 11 vector mcdintr
-controller matcd0 at isa? port ? bio
+controller matcd0 at isa? port 0x230 bio
device scd0 at isa? port 0x230 bio
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 4acad504dcb3..ae502aaa0e6d 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.204 1995/10/03 01:12:59 jkh Exp $
+# $Id: LINT,v 1.205 1995/10/10 04:03:12 bde Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -722,7 +722,7 @@ device mcd0 at isa? port 0x300 bio irq 10 vector mcdintr
# for the Sony CDU31/33A CDROM
device scd0 at isa? port 0x230 bio
# for the soundblaster 16 multicd - up to 4 devices
-controller matcd0 at isa? port ? bio
+controller matcd0 at isa? port 0x230 bio
device wt0 at isa? port 0x300 bio irq 5 drq 1 vector wtintr
device ctx0 at isa? port 0x230 iomem 0xd0000
device spigot0 at isa? port 0xad6 irq 15 iomem 0xee000 vector spigintr
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 4acad504dcb3..ae502aaa0e6d 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.204 1995/10/03 01:12:59 jkh Exp $
+# $Id: LINT,v 1.205 1995/10/10 04:03:12 bde Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -722,7 +722,7 @@ device mcd0 at isa? port 0x300 bio irq 10 vector mcdintr
# for the Sony CDU31/33A CDROM
device scd0 at isa? port 0x230 bio
# for the soundblaster 16 multicd - up to 4 devices
-controller matcd0 at isa? port ? bio
+controller matcd0 at isa? port 0x230 bio
device wt0 at isa? port 0x300 bio irq 5 drq 1 vector wtintr
device ctx0 at isa? port 0x230 iomem 0xd0000
device spigot0 at isa? port 0xad6 irq 15 iomem 0xee000 vector spigintr