summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/alpha/api_up1000.c4
-rw-r--r--sys/alpha/alpha/dec_1000a.c2
-rw-r--r--sys/alpha/alpha/dec_2100_a50.c4
-rw-r--r--sys/alpha/alpha/dec_2100_a500.c4
-rw-r--r--sys/alpha/alpha/dec_axppci_33.c4
-rw-r--r--sys/alpha/alpha/dec_eb64plus.c4
-rw-r--r--sys/alpha/alpha/dec_kn20aa.c4
-rw-r--r--sys/alpha/alpha/dec_kn300.c4
-rw-r--r--sys/alpha/alpha/dec_st550.c4
-rw-r--r--sys/alpha/alpha/dec_st6600.c4
-rw-r--r--sys/alpha/mcbus/mcpcia.c4
-rw-r--r--sys/alpha/pci/apecs_pci.c4
-rw-r--r--sys/alpha/pci/cia_pci.c4
-rw-r--r--sys/alpha/pci/irongate.c4
-rw-r--r--sys/alpha/pci/irongate_pci.c4
-rw-r--r--sys/alpha/pci/lca_pci.c4
-rw-r--r--sys/alpha/pci/pcibus.c2
-rw-r--r--sys/alpha/pci/t2.c2
-rw-r--r--sys/alpha/pci/t2_pci.c2
-rw-r--r--sys/alpha/pci/tsunami.c2
-rw-r--r--sys/alpha/pci/tsunami_pci.c2
-rw-r--r--sys/alpha/tlsb/dwlpx.c2
-rw-r--r--sys/dev/agp/agp.c4
-rw-r--r--sys/dev/agp/agp_ali.c4
-rw-r--r--sys/dev/agp/agp_amd.c4
-rw-r--r--sys/dev/agp/agp_i810.c4
-rw-r--r--sys/dev/agp/agp_intel.c4
-rw-r--r--sys/dev/agp/agp_sis.c4
-rw-r--r--sys/dev/agp/agp_via.c4
-rw-r--r--sys/dev/dc/if_dc.c4
-rw-r--r--sys/dev/de/if_de.c4
-rw-r--r--sys/dev/sf/if_sf.c4
-rw-r--r--sys/dev/sk/if_sk.c4
-rw-r--r--sys/dev/ti/if_ti.c4
-rw-r--r--sys/dev/vr/if_vr.c4
-rw-r--r--sys/i386/pci/pci_bus.c6
-rw-r--r--sys/pci/agp.c4
-rw-r--r--sys/pci/agp_ali.c4
-rw-r--r--sys/pci/agp_amd.c4
-rw-r--r--sys/pci/agp_i810.c4
-rw-r--r--sys/pci/agp_intel.c4
-rw-r--r--sys/pci/agp_sis.c4
-rw-r--r--sys/pci/agp_via.c4
-rw-r--r--sys/pci/alpm.c4
-rw-r--r--sys/pci/amdpm.c4
-rw-r--r--sys/pci/if_dc.c4
-rw-r--r--sys/pci/if_de.c4
-rw-r--r--sys/pci/if_mn.c6
-rw-r--r--sys/pci/if_pcn.c4
-rw-r--r--sys/pci/if_rl.c4
-rw-r--r--sys/pci/if_sf.c4
-rw-r--r--sys/pci/if_sis.c4
-rw-r--r--sys/pci/if_sk.c4
-rw-r--r--sys/pci/if_ste.c4
-rw-r--r--sys/pci/if_ti.c4
-rw-r--r--sys/pci/if_tl.c4
-rw-r--r--sys/pci/if_vr.c4
-rw-r--r--sys/pci/if_wb.c4
-rw-r--r--sys/pci/if_xl.c4
-rw-r--r--sys/pci/intpm.c4
-rw-r--r--sys/pci/meteor.c6
-rw-r--r--sys/pci/ncr.c6
-rw-r--r--sys/pci/viapm.c4
-rw-r--r--sys/pci/xrpu.c4
64 files changed, 125 insertions, 125 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"
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 6744a86..ba0eae8 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/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/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c
index d94c7df..b9b2c13 100644
--- a/sys/dev/agp/agp_ali.c
+++ b/sys/dev/agp/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/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c
index d3bfb14..2b1bd12 100644
--- a/sys/dev/agp/agp_amd.c
+++ b/sys/dev/agp/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/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 0f845d9..aaf6d13 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/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/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c
index ad3e105..84fd071 100644
--- a/sys/dev/agp/agp_intel.c
+++ b/sys/dev/agp/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/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c
index aecbb3f..6d8f42b 100644
--- a/sys/dev/agp/agp_sis.c
+++ b/sys/dev/agp/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/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c
index c1ec049..00e4892 100644
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/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/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index dc938fa..6caf01f 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/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/dev/de/if_de.c b/sys/dev/de/if_de.c
index 3aa15c8..3a3d242 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/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/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 9eaad55..fcd05ff 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/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/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 8804997..6893120 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/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/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index ecff154..857774d 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/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/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 4d08d8b..35343da 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/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/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index 832516a..3346a8d 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -36,9 +36,9 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/malloc.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 <isa/isavar.h>
#include <machine/legacyvar.h>
#include <machine/pci_cfgreg.h>
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"
/*
OpenPOWER on IntegriCloud