Prefer new location of pci include files (which have only been in the

tree for two or more years now), except in a few places where there's
code to be compatible with older versions of FreeBSD.

22 files changed, 37 insertions, 37 deletions

diff --git a/sys/alpha/alpha/api_up1000.c b/sys/alpha/alpha/api_up1000.c
index 26437a2..12626f6 100644
--- a/sys/alpha/alpha/api_up1000.c
+++ b/sys/alpha/alpha/api_up1000.c
@@ -44,8 +44,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/rpb.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <alpha/pci/irongatereg.h>
 #include <alpha/pci/irongatevar.h>
 
diff --git a/sys/alpha/alpha/dec_1000a.c b/sys/alpha/alpha/dec_1000a.c
index 9c6fd09..113eca2 100644
--- a/sys/alpha/alpha/dec_1000a.c
+++ b/sys/alpha/alpha/dec_1000a.c
@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD$");
 #include <alpha/pci/apecsvar.h>
 #include <alpha/pci/ciavar.h>
 
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
diff --git a/sys/alpha/alpha/dec_2100_a50.c b/sys/alpha/alpha/dec_2100_a50.c
index f2ceebd..11ea268 100644
--- a/sys/alpha/alpha/dec_2100_a50.c
+++ b/sys/alpha/alpha/dec_2100_a50.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/rpb.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <alpha/pci/apecsreg.h>
 #include <alpha/pci/apecsvar.h>
 
diff --git a/sys/alpha/alpha/dec_2100_a500.c b/sys/alpha/alpha/dec_2100_a500.c
index 1ae8089..ac53a9e6 100644
--- a/sys/alpha/alpha/dec_2100_a500.c
+++ b/sys/alpha/alpha/dec_2100_a500.c
@@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/rpb.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <alpha/pci/t2var.h>
 #include <alpha/pci/t2reg.h>
 
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index 9d1d817..6188ac0 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -47,8 +47,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/rpb.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <alpha/pci/lcavar.h>
 
 #ifndef	CONSPEED
diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c
index 37ff65e..900f1c9 100644
--- a/sys/alpha/alpha/dec_eb64plus.c
+++ b/sys/alpha/alpha/dec_eb64plus.c
@@ -62,8 +62,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/rpb.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include <alpha/pci/apecsreg.h>
 #include <alpha/pci/apecsvar.h>
diff --git a/sys/alpha/alpha/dec_kn20aa.c b/sys/alpha/alpha/dec_kn20aa.c
index 7f0d27d..e2acd2d 100644
--- a/sys/alpha/alpha/dec_kn20aa.c
+++ b/sys/alpha/alpha/dec_kn20aa.c
@@ -46,8 +46,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/rpb.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <alpha/pci/ciareg.h>
 #include <alpha/pci/ciavar.h>
 
diff --git a/sys/alpha/alpha/dec_kn300.c b/sys/alpha/alpha/dec_kn300.c
index ce46fab..a03c9c0 100644
--- a/sys/alpha/alpha/dec_kn300.c
+++ b/sys/alpha/alpha/dec_kn300.c
@@ -48,8 +48,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/rpb.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include <alpha/mcbus/mcbusreg.h>
 #include <alpha/mcbus/mcbusvar.h>
diff --git a/sys/alpha/alpha/dec_st550.c b/sys/alpha/alpha/dec_st550.c
index 0068602..3a8a32c 100644
--- a/sys/alpha/alpha/dec_st550.c
+++ b/sys/alpha/alpha/dec_st550.c
@@ -51,8 +51,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/rpb.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <alpha/pci/ciareg.h>
 #include <alpha/pci/ciavar.h>
 
diff --git a/sys/alpha/alpha/dec_st6600.c b/sys/alpha/alpha/dec_st6600.c
index d7e298f..528ea7d 100644
--- a/sys/alpha/alpha/dec_st6600.c
+++ b/sys/alpha/alpha/dec_st6600.c
@@ -44,8 +44,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/intr.h>
 #include <machine/rpb.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <alpha/pci/tsunamivar.h>
 
 #ifndef	CONSPEED
diff --git a/sys/alpha/mcbus/mcpcia.c b/sys/alpha/mcbus/mcpcia.c
index ee2ecff..442a47b 100644
--- a/sys/alpha/mcbus/mcpcia.c
+++ b/sys/alpha/mcbus/mcpcia.c
@@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$");
 #include <alpha/mcbus/mcpciareg.h>
 #include <alpha/mcbus/mcpciavar.h>
 #include <alpha/pci/pcibus.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include "alphapci_if.h"
 #include "pcib_if.h"
diff --git a/sys/alpha/pci/apecs_pci.c b/sys/alpha/pci/apecs_pci.c
index 2d91c20..d074563 100644
--- a/sys/alpha/pci/apecs_pci.c
+++ b/sys/alpha/pci/apecs_pci.c
@@ -34,8 +34,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <machine/cpuconf.h>
 #include <machine/swiz.h>
 #include <machine/md_var.h>
diff --git a/sys/alpha/pci/cia_pci.c b/sys/alpha/pci/cia_pci.c
index e6c083b9..f2fc5d4 100644
--- a/sys/alpha/pci/cia_pci.c
+++ b/sys/alpha/pci/cia_pci.c
@@ -98,8 +98,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/md_var.h>
 #include <sys/rman.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <machine/cpuconf.h>
 #include <machine/bwx.h>
 #include <machine/swiz.h>
diff --git a/sys/alpha/pci/irongate.c b/sys/alpha/pci/irongate.c
index ea314cb..a744c3d 100644
--- a/sys/alpha/pci/irongate.c
+++ b/sys/alpha/pci/irongate.c
@@ -38,8 +38,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/malloc.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <alpha/isa/isavar.h>
 #include <alpha/pci/irongatereg.h>
 #include <alpha/pci/irongatevar.h>
diff --git a/sys/alpha/pci/irongate_pci.c b/sys/alpha/pci/irongate_pci.c
index 6a00951..e3bdf69 100644
--- a/sys/alpha/pci/irongate_pci.c
+++ b/sys/alpha/pci/irongate_pci.c
@@ -37,8 +37,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/bwx.h>
 #include <sys/rman.h>
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <alpha/pci/irongatereg.h>
 #include <alpha/pci/irongatevar.h>
 #include <alpha/pci/pcibus.h>
diff --git a/sys/alpha/pci/lca_pci.c b/sys/alpha/pci/lca_pci.c
index be36276..54a55d4 100644
--- a/sys/alpha/pci/lca_pci.c
+++ b/sys/alpha/pci/lca_pci.c
@@ -35,8 +35,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <machine/cpuconf.h>
 #include <machine/swiz.h>
 #include <machine/md_var.h>
diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c
index 7765fa3..a117528 100644
--- a/sys/alpha/pci/pcibus.c
+++ b/sys/alpha/pci/pcibus.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/rman.h>
 
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 #include <machine/chipset.h>
 #include <machine/cpuconf.h>
 #include <machine/resource.h>
diff --git a/sys/alpha/pci/t2.c b/sys/alpha/pci/t2.c
index 8db8a71..72cf4b2 100644
--- a/sys/alpha/pci/t2.c
+++ b/sys/alpha/pci/t2.c
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/interrupt.h>
 
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 #include <alpha/pci/t2reg.h>
 #include <alpha/pci/t2var.h>
 #include <alpha/isa/isavar.h>
diff --git a/sys/alpha/pci/t2_pci.c b/sys/alpha/pci/t2_pci.c
index eedccfb..44288a0 100644
--- a/sys/alpha/pci/t2_pci.c
+++ b/sys/alpha/pci/t2_pci.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 #include <machine/swiz.h>
 #include <machine/md_var.h>
 
diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c
index 29e7718..12db80e 100644
--- a/sys/alpha/pci/tsunami.c
+++ b/sys/alpha/pci/tsunami.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/interrupt.h>
 #include <sys/malloc.h>
 
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 #include <alpha/isa/isavar.h>
 #include <alpha/pci/tsunamireg.h>
 #include <alpha/pci/tsunamivar.h>
diff --git a/sys/alpha/pci/tsunami_pci.c b/sys/alpha/pci/tsunami_pci.c
index 4344c6a..9b5853c 100644
--- a/sys/alpha/pci/tsunami_pci.c
+++ b/sys/alpha/pci/tsunami_pci.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/md_var.h>
 #include <sys/rman.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 #include <alpha/pci/tsunamireg.h>
 #include <alpha/pci/tsunamivar.h>
 #include <alpha/pci/pcibus.h>
diff --git a/sys/alpha/tlsb/dwlpx.c b/sys/alpha/tlsb/dwlpx.c
index 9603a07..467f125 100644
--- a/sys/alpha/tlsb/dwlpx.c
+++ b/sys/alpha/tlsb/dwlpx.c
@@ -89,7 +89,7 @@ __FBSDID("$FreeBSD$");
 #include <alpha/tlsb/dwlpxreg.h>
 #include <alpha/tlsb/dwlpxvar.h>
 #include <alpha/pci/pcibus.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 
 #include "alphapci_if.h"
 #include "pcib_if.h"