From 38d8c9940bac138b83c5aa0066f0e2623d3a3512 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 22 Aug 2003 06:42:59 +0000
Subject: 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            | 2 +-
 sys/dev/mii/brgphy.c          | 4 ++--
 sys/dev/mii/dcphy.c           | 2 +-
 sys/dev/mlx/mlx_pci.c         | 4 ++--
 sys/dev/mly/mly.c             | 4 ++--
 sys/dev/mpt/mpt_pci.c         | 4 ++--
 sys/dev/musycc/musycc.c       | 4 ++--
 sys/dev/my/if_my.c            | 6 +++---
 sys/dev/nge/if_nge.c          | 4 ++--
 sys/dev/patm/if_patm_attach.c | 4 ++--
 sys/dev/pccbb/pccbb.c         | 4 ++--
 sys/dev/pci/eisa_pci.c        | 4 ++--
 sys/dev/pci/fixup_pci.c       | 4 ++--
 sys/dev/pci/ignore_pci.c      | 2 +-
 sys/dev/pci/isa_pci.c         | 4 ++--
 sys/dev/pci/pci_pci.c         | 6 +++---
 sys/dev/pci/pci_user.c        | 4 ++--
 sys/dev/pst/pst-iop.c         | 4 ++--
 sys/dev/pst/pst-pci.c         | 4 ++--
 sys/dev/pst/pst-raid.c        | 4 ++--
 sys/dev/rp/rp_pci.c           | 4 ++--
 21 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index 7c92e627a04b..829100022530 100644
--- a/sys/dev/dc/dcphy.c
+++ b/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>
 
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 987de9553ec4..fa19b757e9c2 100644
--- a/sys/dev/mii/brgphy.c
+++ b/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"
 
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 7c92e627a04b..829100022530 100644
--- a/sys/dev/mii/dcphy.c
+++ b/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>
 
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index b36f143210da..fecd7c45992d 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/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>
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 874c0e31483b..0d56b75fb94e 100644
--- a/sys/dev/mly/mly.c
+++ b/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>
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c
index 09c284764cb5..f68d113049d7 100644
--- a/sys/dev/mpt/mpt_pci.c
+++ b/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>
diff --git a/sys/dev/musycc/musycc.c b/sys/dev/musycc/musycc.c
index 6d78dec7cf2a..b25efc88226d 100644
--- a/sys/dev/musycc/musycc.c
+++ b/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"
 
 
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 98dfbed71e31..6ccf4b3c8b61 100644
--- a/sys/dev/my/if_my.c
+++ b/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
 
 /*
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 044fdc2ffffb..849e2474a3ca 100644
--- a/sys/dev/nge/if_nge.c
+++ b/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
 
diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c
index 036bc41fff83..4081b08469b7 100644
--- a/sys/dev/patm/if_patm_attach.c
+++ b/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>
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index 5a7cb938e0de..cfc5de057bbc 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/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>
diff --git a/sys/dev/pci/eisa_pci.c b/sys/dev/pci/eisa_pci.c
index 6572801859de..1eb9f4ce4d61 100644
--- a/sys/dev/pci/eisa_pci.c
+++ b/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);
diff --git a/sys/dev/pci/fixup_pci.c b/sys/dev/pci/fixup_pci.c
index df487b2f981b..b79516479e6b 100644
--- a/sys/dev/pci/fixup_pci.c
+++ b/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.
diff --git a/sys/dev/pci/ignore_pci.c b/sys/dev/pci/ignore_pci.c
index 520099df3906..4da57ef3e425 100644
--- a/sys/dev/pci/ignore_pci.c
+++ b/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);
 
diff --git a/sys/dev/pci/isa_pci.c b/sys/dev/pci/isa_pci.c
index 3f1b779c1900..e095b78d828b 100644
--- a/sys/dev/pci/isa_pci.c
+++ b/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
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index 29dd9526a2b0..cb3b30e9b6a4 100644
--- a/sys/dev/pci/pci_pci.c
+++ b/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"
 
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index a295af77daf7..33bc0151e4b2 100644
--- a/sys/dev/pci/pci_user.c
+++ b/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"
diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c
index dd372ef2edfc..ed4c19d9f4a5 100644
--- a/sys/dev/pst/pst-iop.c
+++ b/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"
 
diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c
index 47272dc4de6f..2c4d678ad8e5 100644
--- a/sys/dev/pst/pst-pci.c
+++ b/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"
 
diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c
index 957d3b7e6a76..3eaf5cfb8ca6 100644
--- a/sys/dev/pst/pst-raid.c
+++ b/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"
diff --git a/sys/dev/rp/rp_pci.c b/sys/dev/rp/rp_pci.c
index 0e10266b466d..3ef443b12037 100644
--- a/sys/dev/rp/rp_pci.c
+++ b/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
-- 
cgit v1.3