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.

28 files changed, 59 insertions, 59 deletions

diff --git a/sys/pci/agp.c b/sys/pci/agp.c
index 6744a86..ba0eae8 100644
--- a/sys/pci/agp.c
+++ b/sys/pci/agp.c
@@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/proc.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <pci/agppriv.h>
 #include <pci/agpvar.h>
 #include <pci/agpreg.h>
diff --git a/sys/pci/agp_ali.c b/sys/pci/agp_ali.c
index d94c7df..b9b2c13 100644
--- a/sys/pci/agp_ali.c
+++ b/sys/pci/agp_ali.c
@@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/proc.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <pci/agppriv.h>
 #include <pci/agpreg.h>
 
diff --git a/sys/pci/agp_amd.c b/sys/pci/agp_amd.c
index d3bfb14..2b1bd12 100644
--- a/sys/pci/agp_amd.c
+++ b/sys/pci/agp_amd.c
@@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/proc.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <pci/agppriv.h>
 #include <pci/agpreg.h>
 
diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c
index 0f845d9..aaf6d13 100644
--- a/sys/pci/agp_i810.c
+++ b/sys/pci/agp_i810.c
@@ -45,8 +45,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/proc.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <pci/agppriv.h>
 #include <pci/agpreg.h>
 
diff --git a/sys/pci/agp_intel.c b/sys/pci/agp_intel.c
index ad3e105..84fd071 100644
--- a/sys/pci/agp_intel.c
+++ b/sys/pci/agp_intel.c
@@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/proc.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <pci/agppriv.h>
 #include <pci/agpreg.h>
 
diff --git a/sys/pci/agp_sis.c b/sys/pci/agp_sis.c
index aecbb3f..6d8f42b 100644
--- a/sys/pci/agp_sis.c
+++ b/sys/pci/agp_sis.c
@@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/proc.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <pci/agppriv.h>
 #include <pci/agpreg.h>
 
diff --git a/sys/pci/agp_via.c b/sys/pci/agp_via.c
index c1ec049..00e4892 100644
--- a/sys/pci/agp_via.c
+++ b/sys/pci/agp_via.c
@@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/proc.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <pci/agppriv.h>
 #include <pci/agpreg.h>
 
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index 6fe3b51..c3e04f6 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -44,8 +44,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/smbus/smbconf.h>
diff --git a/sys/pci/amdpm.c b/sys/pci/amdpm.c
index 6c18f48..c01d5129 100644
--- a/sys/pci/amdpm.c
+++ b/sys/pci/amdpm.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/smbus/smbconf.h>
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index dc938fa..6caf01f 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -122,8 +122,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #define DC_USEIOSPACE
 #ifdef __alpha__
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 3aa15c8..3a3d242 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -74,8 +74,8 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if_var.h>
 #include <vm/pmap.h>
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <pci/dc21040reg.h>
 
 /*
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index 10250d5..00745ba 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: if_mn.c,v 1.1 1999/02/01 13:06:40 phk Exp $
+ * $Id: if_mn.c,v 1.38 2003/06/11 06:24:36 obrien Exp $
  *
  * Driver for Siemens reference design card "Easy321-R1".
  *
@@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/malloc.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include "pci_if.h"
 
 #include <machine/bus.h>
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index cdda6e1..98fa75e 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -80,8 +80,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #define PCN_USEIOSPACE
 
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index e06c055..eca9a19 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -164,8 +164,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 MODULE_DEPEND(rl, pci, 1, 1, 1);
 MODULE_DEPEND(rl, ether, 1, 1, 1);
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 9eaad55..fcd05ff 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -111,8 +111,8 @@ __FBSDID("$FreeBSD$");
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #define SF_USEIOSPACE
 
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 9f3cf71..5c78900 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -87,8 +87,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #define SIS_USEIOSPACE
 
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 8804997..6893120 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -99,8 +99,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/miivar.h>
 #include <dev/mii/brgphyreg.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #define SK_USEIOSPACE
 
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index daa7d59..931c769 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -62,8 +62,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index ecff154..857774d 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -134,8 +134,8 @@ __FBSDID("$FreeBSD$");
 #endif /* !TI_PRIVATE_JUMBOS */
 #include <sys/vnode.h> /* for vfindev, vgone */
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include <sys/tiio.h>
 #include <pci/if_tireg.h>
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 4fb66ee..b7b2834 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -207,8 +207,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 /*
  * Default to using PIO register access mode to pacify certain
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 4d08d8b..35343da 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -88,8 +88,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #define VR_USEIOSPACE
 
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index ab5b47c..3694c28 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -112,8 +112,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/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 <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index a5922ab..93db5b8 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -128,8 +128,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 MODULE_DEPEND(xl, pci, 1, 1, 1);
 MODULE_DEPEND(xl, ether, 1, 1, 1);
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index 3296dce..defc2c7 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -46,8 +46,8 @@ __FBSDID("$FreeBSD$");
 /*This should be removed if force_pci_map_int supported*/
 #include <sys/interrupt.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <pci/intpmreg.h>
 
 #include "opt_intpm.h"
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index 62666cc..c2fa54f 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -171,10 +171,10 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <machine/ioctl_meteor.h>
-#include <pci/meteor_reg.h>
+#include <dev/pci/meteor_reg.h>
 
 #ifndef COMPAT_OLDPCI
 #error "The meteor device requires the old pci compatibility shims"
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index a1d58a0..54fdf11 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -191,9 +191,9 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 #endif
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
-#include <pci/ncrreg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/ncrreg.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c
index 2532cf4..0312997 100644
--- a/sys/pci/viapm.c
+++ b/sys/pci/viapm.c
@@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 074e300..9782399 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -29,8 +29,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include "pci_if.h"
 
 /*