Include files.agp and files.drm from files.pci. Makes sure "drm.h" gets

generated on all architectures that support pci, making alpha and loongson
compile again.

ok todd@, miod@ seemed to agree with the idea

8 files changed, 11 insertions, 22 deletions

diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index a7ced36b9d9..9cca3b3ec60 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.95 2013/03/09 16:48:55 deraadt Exp $
+#	$OpenBSD: files.alpha,v 1.96 2013/08/15 06:54:35 kettenis Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -182,8 +182,6 @@ file	arch/alpha/eisa/eisa_machdep.c		eisa
 
 # include "dev/pci/files.pci" XXX SEE ABOVE
 
-include "dev/pci/files.agp"
-
 file	arch/alpha/pci/pciide_machdep.c		pciide
 
 define	alpha_pci_sgmap_pte64
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index e438574bc8e..77f8309e4f2 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.69 2013/08/12 04:11:52 jsg Exp $
+#	$OpenBSD: files.amd64,v 1.70 2013/08/15 06:54:35 kettenis Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -126,11 +126,8 @@ attach	amas at pci
 file	dev/pci/amas.c				amas
 
 # AGP bridge support. most attach at pchb
-include "dev/pci/files.agp"
 file	arch/amd64/pci/agp_machdep.c		agp
 
-include "dev/pci/drm/files.drm"
-
 #
 # CARDBUS
 #
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 4d1f5d580fc..d81f525b963 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.212 2013/08/12 04:11:52 jsg Exp $
+#	$OpenBSD: files.i386,v 1.213 2013/08/15 06:54:35 kettenis Exp $
 #
 # new style config file for i386 architecture
 #
@@ -116,11 +116,8 @@ attach  amas at pci
 file    dev/pci/amas.c			amas
 
 # AGP bridge support. most attach at pchb
-include "dev/pci/files.agp"
 file	arch/i386/pci/agp_machdep.c	agp
 
-include "dev/pci/drm/files.drm"
-
 # AMD Elan SC520 System Controller (PCI-Host bridge)
 device	elansc: gpiobus
 attach	elansc at pci
diff --git a/sys/arch/loongson/conf/files.loongson b/sys/arch/loongson/conf/files.loongson
index 092f5068d0c..82f74f98878 100644
--- a/sys/arch/loongson/conf/files.loongson
+++ b/sys/arch/loongson/conf/files.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.loongson,v 1.15 2013/06/02 21:46:04 pirofti Exp $
+#	$OpenBSD: files.loongson,v 1.16 2013/08/15 06:54:35 kettenis Exp $
 
 # Standard stanzas config(8) can't run without
 maxpartitions 16
@@ -39,7 +39,6 @@ include	"dev/isa/files.isa"
 include	"dev/isa/files.isapnp"
 include	"dev/mii/files.mii"
 include	"dev/pci/files.pci"
-include	"dev/pci/files.agp"
 include	"dev/pckbc/files.pckbc"
 include	"dev/usb/files.usb"
 include "dev/bluetooth/files.bluetooth"
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index 1c3ceb65df3..633676fe1ae 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.macppc,v 1.73 2013/08/12 08:38:03 mpi Exp $
+#	$OpenBSD: files.macppc,v 1.74 2013/08/15 06:54:35 kettenis Exp $
 
 #
 # macppc-specific configuration info
@@ -98,8 +98,6 @@ attach	pchb at pci
 file	arch/macppc/pci/pchb.c				pchb
 
 # AGP bridge support. attach at pchb
-include "dev/pci/files.agp"
-include "dev/pci/drm/files.drm"
 file	arch/macppc/pci/agp_machdep.c			agp
 
 #
diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon
index 59965214723..0ea3c0b16a8 100644
--- a/sys/arch/octeon/conf/files.octeon
+++ b/sys/arch/octeon/conf/files.octeon
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.octeon,v 1.13 2013/03/26 18:46:55 jasper Exp $
+#	$OpenBSD: files.octeon,v 1.14 2013/08/15 06:54:35 kettenis Exp $
 
 # Standard stanzas config(8) can't run without
 maxpartitions 16
@@ -30,7 +30,6 @@ include	"dev/isa/files.isa"
 include	"dev/isa/files.isapnp"
 include	"dev/mii/files.mii"
 include	"dev/pci/files.pci"
-include	"dev/pci/files.agp"
 include	"dev/pckbc/files.pckbc"
 include	"dev/usb/files.usb"
 include "dev/bluetooth/files.bluetooth"
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 8ecc4bc3322..96e4969ae35 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc64,v 1.141 2013/08/12 04:11:52 jsg Exp $
+#	$OpenBSD: files.sparc64,v 1.142 2013/08/15 06:54:35 kettenis Exp $
 #	$NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
 
 # maxpartitions must be first item in files.${ARCH}
@@ -107,8 +107,6 @@ attach	gfb at upa
 file	arch/sparc64/dev/gfb.c			gfb
 
 include	"dev/pci/files.pci"
-include	"dev/pci/files.agp"
-include	"dev/pci/drm/files.drm"
 major	{wd = 12}
 
 device	psycho: pcibus, iommu
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 85398a97dcf..f9d57db5e8f 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pci,v 1.294 2013/06/01 01:13:34 reyk Exp $
+#	$OpenBSD: files.pci,v 1.295 2013/08/15 06:54:35 kettenis Exp $
 #	$NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
 #
 # Config file and device description for machine-independent PCI code.
@@ -849,3 +849,6 @@ file	dev/pci/vioblk.c		vioblk
 device	viomb
 attach	viomb at virtio
 file	dev/pci/viomb.c			viomb
+
+include "dev/pci/files.agp"
+include "dev/pci/drm/files.drm"