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.

sys/dev/dc/dcphy.c

@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/bus.h>
 
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 
 #include <pci/if_dcreg.h>
 

sys/dev/mii/brgphy.c

@@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <dev/bge/if_bgereg.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include "miibus_if.h"
 

sys/dev/mii/dcphy.c

@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/bus.h>
 
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 
 #include <pci/if_dcreg.h>
 

sys/dev/mlx/mlx_pci.c

@@ -41,8 +41,8 @@
 
 #include <geom/geom_disk.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include <dev/mlx/mlx_compat.h>
 #include <dev/mlx/mlxio.h>

sys/dev/mly/mly.c

@@ -50,8 +50,8 @@
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include <dev/mly/mlyreg.h>
 #include <dev/mly/mlyio.h>

sys/dev/mpt/mpt_pci.c

@@ -37,8 +37,8 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>

sys/dev/musycc/musycc.c

@@ -51,8 +51,8 @@
 #include <machine/clock.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"
 
 

sys/dev/my/if_my.c

@@ -64,8 +64,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>
@@ -91,7 +91,7 @@ static int      MY_USEIOSPACE = 1;
 
 #ifndef lint
 static          const char rcsid[] =
-"$Id: if_my.c,v 1.50 2001/12/03 04:15:33 <yen_cw@myson.com.tw> wpaul Exp $";
+"$Id: if_my.c,v 1.16 2003/04/15 06:37:25 mdodd Exp $";
 #endif
 
 /*

sys/dev/nge/if_nge.c

@@ -119,8 +119,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 NGE_USEIOSPACE
 

sys/dev/patm/if_patm_attach.c

@@ -69,8 +69,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/mbpool.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include <dev/utopia/utopia.h>
 #include <dev/patm/idt77252reg.h>

sys/dev/pccbb/pccbb.c

@@ -90,8 +90,8 @@
 #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 <machine/clock.h>
 
 #include <dev/pccard/pccardreg.h>

sys/dev/pci/eisa_pci.c

@@ -38,8 +38,8 @@
 #include <sys/kernel.h>
 #include <sys/bus.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 
 static int	eisab_probe(device_t dev);
 static int	eisab_attach(device_t dev);

sys/dev/pci/fixup_pci.c

@@ -36,8 +36,8 @@
 #include <sys/kernel.h>
 #include <sys/bus.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 
 /*
  * Chipset fixups.

sys/dev/pci/ignore_pci.c

@@ -36,7 +36,7 @@
 #include <sys/kernel.h>
 #include <sys/bus.h>
 
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 
 static int	ignore_pci_probe(device_t dev);
 

sys/dev/pci/isa_pci.c

@@ -43,8 +43,8 @@
 #include <sys/rman.h>
 
 #include <isa/isavar.h>
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 
 #define	ELCR_IOADDR	0x4d0	/* Interrupt Edge/Level Control Registers */
 #define	ELCR_IOLEN	2

sys/dev/pci/pci_pci.c

@@ -44,9 +44,9 @@
 
 #include <machine/resource.h>
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
-#include <pci/pcib_private.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcib_private.h>
 
 #include "pcib_if.h"
 

sys/dev/pci/pci_user.c

@@ -51,8 +51,8 @@
 #include <machine/resource.h>
 
 #include <sys/pciio.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 #include "pcib_if.h"
 #include "pci_if.h"

sys/dev/pst/pst-iop.c

@@ -43,8 +43,8 @@
 #include <machine/resource.h>
 #include <machine/bus.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/pst/pst-iop.h"
 

sys/dev/pst/pst-pci.c

@@ -43,8 +43,8 @@
 #include <machine/resource.h>
 #include <machine/bus.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/pst/pst-iop.h"
 

sys/dev/pst/pst-raid.c

@@ -45,8 +45,8 @@
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <geom/geom_disk.h>
 
 #include "dev/pst/pst-iop.h"

sys/dev/rp/rp_pci.c

@@ -51,8 +51,8 @@
 #include <dev/rp/rpreg.h>
 #include <dev/rp/rpvar.h>
 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 
 /* PCI IDs  */
 #define RP_VENDOR_ID		0x11FE