summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-04-30 20:06:25 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-04-30 20:06:25 +0000
commitfb19f86b95cfa840e46d651bf8c15f19395d001c (patch)
treec45f14bbb5339550ad5f2fb9580b6a5e48f60259 /sys/arch
parent60e032b3d2a3ab02b75d6af8532e0045c984ed34 (diff)
sync the I2O section with macppc config, adding the I2O SCSI pass-through driver.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/conf/GENERIC8
-rw-r--r--sys/arch/i386/conf/RAMDISKB8
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD8
3 files changed, 15 insertions, 9 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index c29e733965e..8327dca2bd5 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.486 2006/04/29 02:15:06 jsg Exp $
+# $OpenBSD: GENERIC,v 1.487 2006/04/30 20:06:24 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -641,9 +641,11 @@ safe* at pci? # SafeNet SafeXcel 1141/1741
#ises* at pci? # Pijnenburg PCC-ISES
# I2O
-iop* at pci? # I2O
-ioprbs* at iop? # Random block storage
+iop* at pci? # I2O processor
+ioprbs* at iop? # I2O arrays
scsibus* at ioprbs?
+iopsp* at iop? # I2O SCSI pass-through
+scsibus* at iopsp?
# GPIO ``pin bus'' drivers
#gpioiic* at gpio? offset 0 mask 0x3 # I2C bus bit-banging
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index e07765b6f18..6b79238bfd2 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.87 2006/04/14 21:52:47 weingart Exp $
+# $OpenBSD: RAMDISKB,v 1.88 2006/04/30 20:06:24 brad Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -199,9 +199,11 @@ wd* at wdc? flags 0x0000
wd* at pciide? flags 0x0000
# I2O
-iop* at pci? # I2O
-ioprbs* at iop? # Random block storage
+iop* at pci? # I2O processor
+ioprbs* at iop? # I2O arrays
scsibus* at ioprbs?
+iopsp* at iop? # I2O SCSI pass-through
+scsibus* at iopsp?
# ATAPI<->SCSI
atapiscsi* at wdc?
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index f3c54eb2599..b26b1ede48a 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.115 2006/04/14 21:52:47 weingart Exp $
+# $OpenBSD: RAMDISK_CD,v 1.116 2006/04/30 20:06:24 brad Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -234,9 +234,11 @@ wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
scsibus* at wds?
# I2O
-iop* at pci? # I2O
-ioprbs* at iop? # Random block storage
+iop* at pci? # I2O processor
+ioprbs* at iop? # I2O arrays
scsibus* at ioprbs?
+iopsp* at iop? # I2O SCSI pass-through
+scsibus* at iopsp?
sd* at scsibus? # SCSI disk drives
st* at scsibus? # SCSI tape drives