diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/alpha/conf/files.alpha | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/files.amd64 | 4 | ||||
| -rw-r--r-- | sys/arch/armish/conf/files.armish | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 9 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/files.macppc | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/files.sgi | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/files.sparc64 | 4 |
7 files changed, 7 insertions, 25 deletions
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index 73c31a39268..7c416d1157e 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: files.alpha,v 1.92 2011/10/06 20:49:28 deraadt Exp $ +# $OpenBSD: files.alpha,v 1.93 2011/11/15 22:27:52 deraadt Exp $ # $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $ # # alpha-specific configuration info @@ -133,8 +133,6 @@ include "dev/pci/files.pci" # XXX some ISA devs are 'at pci' too. include "dev/isa/files.isa" major {wd = 0} -include "dev/puc/files.puc" - # # ISA Bus devices # diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64 index a021096237d..f7ec52acd39 100644 --- a/sys/arch/amd64/conf/files.amd64 +++ b/sys/arch/amd64/conf/files.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.amd64,v 1.65 2011/11/14 15:06:16 deraadt Exp $ +# $OpenBSD: files.amd64,v 1.66 2011/11/15 22:27:52 deraadt Exp $ maxpartitions 16 maxusers 2 16 128 @@ -114,8 +114,6 @@ file arch/amd64/pci/pci_machdep.c pci file arch/amd64/pci/pciide_machdep.c pciide file arch/amd64/pci/vga_post.c vga_pci & x86emu -include "dev/puc/files.puc" - # PCI Host bridge chipsets device pchb: pcibus, agpbus attach pchb at pci diff --git a/sys/arch/armish/conf/files.armish b/sys/arch/armish/conf/files.armish index 5ed6b8d971e..4dd04f795a9 100644 --- a/sys/arch/armish/conf/files.armish +++ b/sys/arch/armish/conf/files.armish @@ -1,4 +1,4 @@ -# $OpenBSD: files.armish,v 1.14 2010/12/06 20:10:17 jasper Exp $ +# $OpenBSD: files.armish,v 1.15 2011/11/15 22:27:52 deraadt Exp $ maxpartitions 16 maxusers 2 8 64 @@ -70,7 +70,6 @@ include "dev/mii/files.mii" include "dev/pci/files.pci" file arch/armish/dev/pciide_machdep.c pciide -include "dev/puc/files.puc" include "dev/atapiscsi/files.atapiscsi" diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 516fbee3f20..01e2ae4b025 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.208 2011/10/06 20:49:28 deraadt Exp $ +# $OpenBSD: files.i386,v 1.209 2011/11/15 22:27:52 deraadt Exp $ # # new style config file for i386 architecture # @@ -367,13 +367,6 @@ attach tcic at isa with tcic_isa file dev/isa/tcic2_isa.c tcic_isa # -# Machine-independent PUC drivers -# -include "dev/puc/files.puc" - -# PCMCIA wants to be probed as late as possible. - -# # Machine-independent PCMCIA drivers # include "dev/pcmcia/files.pcmcia" diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index f2b7ba88d56..60b69d7fc6b 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.macppc,v 1.64 2011/05/25 07:42:15 mpi Exp $ +# $OpenBSD: files.macppc,v 1.65 2011/11/15 22:27:53 deraadt Exp $ # # macppc-specific configuration info @@ -66,8 +66,6 @@ include "dev/i2o/files.i2o" include "dev/pci/files.pci" file arch/macppc/pci/pciide_machdep.c pciide -include "dev/puc/files.puc" - device mpcpcibr {} : pcibus attach mpcpcibr at mainbus file arch/macppc/pci/mpcpcibus.c mpcpcibr diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi index a11b5cff8cc..83953010ed9 100644 --- a/sys/arch/sgi/conf/files.sgi +++ b/sys/arch/sgi/conf/files.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: files.sgi,v 1.45 2010/03/22 21:22:08 miod Exp $ +# $OpenBSD: files.sgi,v 1.46 2011/11/15 22:27:53 deraadt Exp $ # # maxpartitions must be first item in files.${ARCH} # @@ -93,8 +93,6 @@ include "dev/i2o/files.i2o" include "dev/pci/files.pci" file arch/sgi/pci/pci_machdep.c pci -include "dev/puc/files.puc" - # Sun HME Ethernet controllers device hme: ether, ifnet, mii, ifmedia file dev/ic/hme.c hme diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64 index 76a1b8eeab2..3928f162592 100644 --- a/sys/arch/sparc64/conf/files.sparc64 +++ b/sys/arch/sparc64/conf/files.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc64,v 1.134 2011/07/06 05:48:57 kettenis Exp $ +# $OpenBSD: files.sparc64,v 1.135 2011/11/15 22:27:53 deraadt Exp $ # $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $ # maxpartitions must be first item in files.${ARCH} @@ -109,8 +109,6 @@ file arch/sparc64/dev/gfb.c gfb include "dev/pci/files.pci" major {wd = 12} -include "dev/puc/files.puc" - device psycho: pcibus, iommu attach psycho at mainbus file arch/sparc64/dev/psycho.c psycho |