summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/conf/files.alpha5
-rw-r--r--sys/arch/amd64/conf/GENERIC7
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD7
-rw-r--r--sys/arch/amd64/conf/files.amd644
-rw-r--r--sys/arch/armish/conf/files.armish5
-rw-r--r--sys/arch/armv7/conf/files.armv75
-rw-r--r--sys/arch/hppa/conf/files.hppa5
-rw-r--r--sys/arch/hppa64/conf/files.hppa645
-rw-r--r--sys/arch/i386/conf/GENERIC7
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD7
-rw-r--r--sys/arch/i386/conf/files.i3867
-rw-r--r--sys/arch/landisk/conf/files.landisk7
-rw-r--r--sys/arch/loongson/conf/files.loongson3
-rw-r--r--sys/arch/macppc/conf/GENERIC6
-rw-r--r--sys/arch/macppc/conf/RAMDISK6
-rw-r--r--sys/arch/macppc/conf/files.macppc7
-rw-r--r--sys/arch/octeon/conf/files.octeon3
-rw-r--r--sys/arch/sgi/conf/files.sgi4
-rw-r--r--sys/arch/socppc/conf/files.socppc7
-rw-r--r--sys/arch/sparc64/conf/files.sparc643
-rw-r--r--sys/arch/zaurus/conf/files.zaurus5
21 files changed, 21 insertions, 94 deletions
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index 9cca3b3ec60..0f724285b02 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-# $OpenBSD: files.alpha,v 1.96 2013/08/15 06:54:35 kettenis Exp $
+# $OpenBSD: files.alpha,v 1.97 2013/11/04 14:07:15 deraadt Exp $
# $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
#
# alpha-specific configuration info
@@ -46,9 +46,6 @@ major {cd = 3}
major {sd = 8}
major {rd = 6}
-# I2O
-include "dev/i2o/files.i2o"
-
# Raster operations
include "dev/rasops/files.rasops"
include "dev/wsfont/files.wsfont"
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index a0f83dbf72a..15376392185 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.351 2013/10/29 22:37:25 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.352 2013/11/04 14:07:15 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -585,11 +585,6 @@ nofn* at pci? # Hi/fn 7814/7851/7854 crypto card
ubsec* at pci? # Bluesteel Networks 5xxx crypto card
safe* at pci? # SafeNet SafeXcel 1141/1741
-# I2O
-iop* at pci? # I2O processor
-ioprbs* at iop? # I2O arrays
-iopsp* at iop? # I2O SCSI pass-through
-
# 1-Wire devices
option ONEWIREVERBOSE
owid* at onewire? # ID
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index d945f50f7ed..4d3fbbc6c94 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.130 2013/10/29 22:37:25 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.131 2013/11/04 14:07:15 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -190,11 +190,6 @@ pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI
vmwpvs* at pci? # VMware ParaVirtual SCSI
softraid0 at root # Software RAID
-# I2O
-iop* at pci? # I2O processor
-ioprbs* at iop? # I2O arrays
-iopsp* at iop? # I2O SCSI pass-through
-
scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
st* at scsibus? # SCSI tape drives
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 77f8309e4f2..b0a3de77a4c 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.amd64,v 1.70 2013/08/15 06:54:35 kettenis Exp $
+# $OpenBSD: files.amd64,v 1.71 2013/11/04 14:07:15 deraadt Exp $
maxpartitions 16
maxusers 2 16 128
@@ -72,8 +72,6 @@ include "dev/mii/files.mii"
include "scsi/files.scsi"
-include "dev/i2o/files.i2o"
-
include "dev/atapiscsi/files.atapiscsi"
include "dev/ata/files.ata"
diff --git a/sys/arch/armish/conf/files.armish b/sys/arch/armish/conf/files.armish
index 4dd04f795a9..186f47d5a31 100644
--- a/sys/arch/armish/conf/files.armish
+++ b/sys/arch/armish/conf/files.armish
@@ -1,4 +1,4 @@
-# $OpenBSD: files.armish,v 1.15 2011/11/15 22:27:52 deraadt Exp $
+# $OpenBSD: files.armish,v 1.16 2013/11/04 14:07:15 deraadt Exp $
maxpartitions 16
maxusers 2 8 64
@@ -26,9 +26,6 @@ file arch/arm/arm/irq_dispatch.S
include "dev/i2c/files.i2c"
-# Machine-independent I2O drivers.
-include "dev/i2o/files.i2o"
-
# ARM i80321 files
include "arch/arm/xscale/files.i80321"
diff --git a/sys/arch/armv7/conf/files.armv7 b/sys/arch/armv7/conf/files.armv7
index d4169f5721e..7e3b969849d 100644
--- a/sys/arch/armv7/conf/files.armv7
+++ b/sys/arch/armv7/conf/files.armv7
@@ -1,4 +1,4 @@
-# $OpenBSD: files.armv7,v 1.7 2013/10/30 20:20:23 syl Exp $
+# $OpenBSD: files.armv7,v 1.8 2013/11/04 14:07:16 deraadt Exp $
maxpartitions 16
maxusers 2 8 64
@@ -40,9 +40,6 @@ include "dev/atapiscsi/files.atapiscsi"
# Machine-independent ATA drivers
include "dev/ata/files.ata"
-# Machine-independent I2O drivers.
-include "dev/i2o/files.i2o"
-
# Include WSCONS stuff
include "dev/wscons/files.wscons"
include "dev/rasops/files.rasops"
diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa
index fd6ae5237a5..cf2f13bc9aa 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: files.hppa,v 1.90 2011/12/21 23:12:03 miod Exp $
+# $OpenBSD: files.hppa,v 1.91 2013/11/04 14:07:16 deraadt Exp $
#
# hppa-specific configuration info
@@ -29,9 +29,6 @@ major {sd = 4}
major {st = 5}
major {cd = 6}
-# I2O
-include "dev/i2o/files.i2o"
-
#
# MI ATAPI drivers
#
diff --git a/sys/arch/hppa64/conf/files.hppa64 b/sys/arch/hppa64/conf/files.hppa64
index ebf70d44e9a..14093cb1a41 100644
--- a/sys/arch/hppa64/conf/files.hppa64
+++ b/sys/arch/hppa64/conf/files.hppa64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.hppa64,v 1.16 2011/10/06 20:49:28 deraadt Exp $
+# $OpenBSD: files.hppa64,v 1.17 2013/11/04 14:07:16 deraadt Exp $
#
# hppa64-specific configuration info
@@ -26,9 +26,6 @@ major { sd = 4 }
major { st = 5 }
major { cd = 6 }
-# I2O
-include "dev/i2o/files.i2o"
-
#
# MI ATAPI drivers
#
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index f80f8d0901a..880964e76df 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.759 2013/10/31 09:57:02 pirofti Exp $
+# $OpenBSD: GENERIC,v 1.760 2013/11/04 14:07:16 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -761,11 +761,6 @@ ubsec* at pci? # Bluesteel Networks 5xxx crypto card
safe* at pci? # SafeNet SafeXcel 1141/1741
glxsb* at pci? # AMD Geode LX series processor security block
-# I2O
-iop* at pci? # I2O processor
-ioprbs* at iop? # I2O arrays
-iopsp* at iop? # I2O SCSI pass-through
-
# GPIO ``pin bus'' drivers
#gpioiic* at gpio? offset 0 mask 0x3 # I2C bus bit-banging
gpioiic* at gpio?
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 1af8c6e6626..09e82619c09 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.204 2013/10/28 12:33:32 mpi Exp $
+# $OpenBSD: RAMDISK_CD,v 1.205 2013/11/04 14:07:16 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -233,11 +233,6 @@ uha* at eisa? # UltraStor 24f SCSI controllers
vmwpvs* at pci? # VMware ParaVirtual SCSI
softraid0 at root # Software RAID
-# I2O
-iop* at pci? # I2O processor
-ioprbs* at iop? # I2O arrays
-iopsp* at iop? # I2O SCSI pass-through
-
scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
st* at scsibus? # SCSI tape drives
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index d81f525b963..bddf9ca02e4 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.213 2013/08/15 06:54:35 kettenis Exp $
+# $OpenBSD: files.i386,v 1.214 2013/11/04 14:07:16 deraadt Exp $
#
# new style config file for i386 architecture
#
@@ -71,11 +71,6 @@ major {cd = 6}
major {rd = 17}
#
-# I2O
-#
-include "dev/i2o/files.i2o"
-
-#
# Machine-independent ATAPI drivers
#
diff --git a/sys/arch/landisk/conf/files.landisk b/sys/arch/landisk/conf/files.landisk
index 369291095c0..39f7754d9b8 100644
--- a/sys/arch/landisk/conf/files.landisk
+++ b/sys/arch/landisk/conf/files.landisk
@@ -1,4 +1,4 @@
-# $OpenBSD: files.landisk,v 1.8 2011/03/03 09:36:25 jasper Exp $
+# $OpenBSD: files.landisk,v 1.9 2013/11/04 14:07:16 deraadt Exp $
# $NetBSD: files.landisk,v 1.2 2006/09/07 01:55:02 uwe Exp $
# maxpartitions must be first item in files.${MACHINE}
@@ -46,11 +46,6 @@ include "dev/ata/files.ata"
include "dev/atapiscsi/files.atapiscsi"
#
-# Machine-independent I2O drivers
-#
-include "dev/i2o/files.i2o"
-
-#
# PCI bus
#
include "dev/mii/files.mii"
diff --git a/sys/arch/loongson/conf/files.loongson b/sys/arch/loongson/conf/files.loongson
index 82f74f98878..46b668181c5 100644
--- a/sys/arch/loongson/conf/files.loongson
+++ b/sys/arch/loongson/conf/files.loongson
@@ -1,4 +1,4 @@
-# $OpenBSD: files.loongson,v 1.16 2013/08/15 06:54:35 kettenis Exp $
+# $OpenBSD: files.loongson,v 1.17 2013/11/04 14:07:16 deraadt Exp $
# Standard stanzas config(8) can't run without
maxpartitions 16
@@ -34,7 +34,6 @@ include "dev/ata/files.ata"
include "dev/atapiscsi/files.atapiscsi"
include "dev/i2c/files.i2c"
include "dev/gpio/files.gpio"
-include "dev/i2o/files.i2o"
include "dev/isa/files.isa"
include "dev/isa/files.isapnp"
include "dev/mii/files.mii"
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 3771695da23..dc160287e76 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.226 2013/09/05 19:42:07 sasano Exp $g
+# $OpenBSD: GENERIC,v 1.227 2013/11/04 14:07:16 deraadt Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -101,10 +101,6 @@ mbg* at pci? # Meinberg Funkuhren radio clocks
malo* at pci? # Marvell Libertas
acx* at pci? # TI ACX100/ACX111 (802.11b/g)
-iop* at pci? # I2O processor
-ioprbs* at iop? # I2O arrays
-iopsp* at iop? # I2O SCSI pass-through
-
amphy* at mii? # AMD 79C873 PHYs
dcphy* at mii? # Digital Clone PHYs
exphy* at mii? # 3Com internal PHYs
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index f959c4d8317..8403781f7a6 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.96 2013/08/20 14:27:29 ajacoutot Exp $
+# $OpenBSD: RAMDISK,v 1.97 2013/11/04 14:07:16 deraadt Exp $
#
# PPC GENERIC config file
#
@@ -87,10 +87,6 @@ vr* at pci? # VIA Rhine ethernet
pcn* at pci? # AMD PCnet-PCI Ethernet
xge* at pci? # Neterion Xframe-I/II 10Gb ethernet
-iop* at pci? # I2O processor
-ioprbs* at iop? # I2O arrays
-iopsp* at iop? # I2O SCSI pass-through
-
# how many of these are needed?
amphy* at mii? # AMD 79C873 PHYs
dcphy* at mii? # Digital Clone PHYs
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index f2563d233ae..4cc93ec16e5 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.macppc,v 1.76 2013/08/28 07:03:02 mpi Exp $
+# $OpenBSD: files.macppc,v 1.77 2013/11/04 14:07:16 deraadt Exp $
#
# macppc-specific configuration info
@@ -58,11 +58,6 @@ major {cd = 3}
include "scsi/files.scsi"
-#
-# I2O
-#
-include "dev/i2o/files.i2o"
-
include "dev/pci/files.pci"
file arch/macppc/pci/pciide_machdep.c pciide
diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon
index e2a0e666411..b3809e0f60c 100644
--- a/sys/arch/octeon/conf/files.octeon
+++ b/sys/arch/octeon/conf/files.octeon
@@ -1,4 +1,4 @@
-# $OpenBSD: files.octeon,v 1.15 2013/10/24 20:47:08 pirofti Exp $
+# $OpenBSD: files.octeon,v 1.16 2013/11/04 14:07:16 deraadt Exp $
# Standard stanzas config(8) can't run without
maxpartitions 16
@@ -25,7 +25,6 @@ include "dev/ata/files.ata"
include "dev/atapiscsi/files.atapiscsi"
include "dev/i2c/files.i2c"
include "dev/gpio/files.gpio"
-include "dev/i2o/files.i2o"
include "dev/isa/files.isa"
include "dev/isa/files.isapnp"
include "dev/mii/files.mii"
diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi
index 767c2c94bca..68dd99ff8ba 100644
--- a/sys/arch/sgi/conf/files.sgi
+++ b/sys/arch/sgi/conf/files.sgi
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sgi,v 1.51 2012/09/29 21:46:02 miod Exp $
+# $OpenBSD: files.sgi,v 1.52 2013/11/04 14:07:16 deraadt Exp $
#
# maxpartitions must be first item in files.${ARCH}
#
@@ -113,8 +113,6 @@ include "scsi/files.scsi"
major {sd = 0}
major {cd = 3}
-include "dev/i2o/files.i2o"
-
#
# EISA Bus support
#
diff --git a/sys/arch/socppc/conf/files.socppc b/sys/arch/socppc/conf/files.socppc
index 3f93aedb020..6b462634a1e 100644
--- a/sys/arch/socppc/conf/files.socppc
+++ b/sys/arch/socppc/conf/files.socppc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.socppc,v 1.10 2010/03/31 16:33:30 deraadt Exp $
+# $OpenBSD: files.socppc,v 1.11 2013/11/04 14:07:16 deraadt Exp $
#
# macppc-specific configuration info
@@ -69,11 +69,6 @@ major {cd = 3}
include "../../../scsi/files.scsi"
-#
-# I2O
-#
-include "../../../dev/i2o/files.i2o"
-
include "dev/pci/files.pci"
file arch/socppc/dev/pciide_machdep.c pciide
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 7e3d51d1aaf..94f61781f63 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sparc64,v 1.143 2013/11/01 21:22:31 miod Exp $
+# $OpenBSD: files.sparc64,v 1.144 2013/11/04 14:07:16 deraadt Exp $
# $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -73,7 +73,6 @@ attach prtc at mainbus
file arch/sparc64/dev/prtc.c prtc
include "dev/sbus/files.sbus"
-include "dev/i2o/files.i2o"
include "dev/mii/files.mii"
include "dev/atapiscsi/files.atapiscsi"
include "dev/ata/files.ata"
diff --git a/sys/arch/zaurus/conf/files.zaurus b/sys/arch/zaurus/conf/files.zaurus
index 3ba067149f5..d77cf92ce11 100644
--- a/sys/arch/zaurus/conf/files.zaurus
+++ b/sys/arch/zaurus/conf/files.zaurus
@@ -1,4 +1,4 @@
-# $OpenBSD: files.zaurus,v 1.27 2011/05/15 08:52:48 matthieu Exp $
+# $OpenBSD: files.zaurus,v 1.28 2013/11/04 14:07:16 deraadt Exp $
#
# First try for arm-specific configuration info
#
@@ -90,9 +90,6 @@ file arch/arm/fpe-arm/armfpe_glue.S armfpe
file arch/arm/fpe-arm/armfpe_init.c armfpe
file arch/arm/fpe-arm/armfpe.s armfpe
-# Machine-independent I2O drivers.
-include "dev/i2o/files.i2o"
-
# Include WSCONS stuff
include "dev/wscons/files.wscons"
include "dev/rasops/files.rasops"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 10:49:53 +0000