diff options
| author | Warner Losh <imp@FreeBSD.org> | 2003-08-22 07:20:27 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2003-08-22 07:20:27 +0000 |
| commit | 19b7ffd1b891310afc81453dc772086e51fadcb1 (patch) | |
| tree | 2617aff9f6c747e7c8d4c7fba6b63c69a1db77d3 | |
| parent | 90cf0136c4c538b610702b30b4f37c875fafb776 (diff) | |
Notes
64 files changed, 125 insertions, 125 deletions
diff --git a/sys/alpha/alpha/api_up1000.c b/sys/alpha/alpha/api_up1000.c index 26437a28123be..12626f6d2e943 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 9c6fd09a4bf51..113eca2d2ac19 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 f2ceebd8f66bb..11ea268e3e499 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 1ae80892583c6..ac53a9e672f5d 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 9d1d81727881e..6188ac01ac6d8 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 37ff65e0fb410..900f1c961d0c8 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 7f0d27d814d4d..e2acd2d5acd06 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 ce46fabc3badd..a03c9c08a2308 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 0068602a3116e..3a8a32c0fcff9 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 d7e298f9b21dd..528ea7dbd01ca 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 ee2ecff2db44a..442a47bb90273 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 2d91c20f8a510..d074563b3bf46 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 e6c083b9db2f2..f2fc5d4c669d9 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 ea314cbaa27a2..a744c3db8e3aa 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 6a009515a4f7d..e3bdf6983a4ba 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 be36276377456..54a55d4064599 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 7765fa3c8b7fc..a117528892019 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 8db8a71f88686..72cf4b2e9bfd8 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 eedccfb9f9518..44288a0daa23c 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 29e77186ebbb8..12db80e87a86c 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 4344c6a3f4361..9b5853c01a622 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 9603a07253136..467f12595ae88 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 6744a86952a02..ba0eae8d614e2 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 d94c7dfe7cc28..b9b2c1326f563 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 d3bfb14471ccf..2b1bd120d9090 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 0f845d9a59329..aaf6d133cd355 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 ad3e10593448a..84fd071ee876a 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 aecbb3f0217ba..6d8f42b0eea7a 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 c1ec049f380c2..00e4892da2cd4 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 dc938fa9c6408..6caf01f875b35 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 3aa15c8dbcb8d..3a3d24247343d 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 9eaad552c0ab6..fcd05ff6ac7e9 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 88049975c03b4..6893120c3c67c 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 ecff1546a5ac9..857774d401986 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 4d08d8b56f218..35343da1733a1 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 832516a7282e9..3346a8df3e1ce 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 6744a86952a02..ba0eae8d614e2 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 d94c7dfe7cc28..b9b2c1326f563 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 d3bfb14471ccf..2b1bd120d9090 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 0f845d9a59329..aaf6d133cd355 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 ad3e10593448a..84fd071ee876a 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 aecbb3f0217ba..6d8f42b0eea7a 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 c1ec049f380c2..00e4892da2cd4 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 6fe3b517963e2..c3e04f64041be 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 6c18f48291325..c01d512997b52 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 dc938fa9c6408..6caf01f875b35 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 3aa15c8dbcb8d..3a3d24247343d 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 10250d51c4452..00745ba69bfe1 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 cdda6e1406ac6..98fa75ea5d0e9 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 e06c0550b5e2d..eca9a191802dd 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 9eaad552c0ab6..fcd05ff6ac7e9 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 9f3cf7127954f..5c78900d60cfb 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 88049975c03b4..6893120c3c67c 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 daa7d598f2b1c..931c7695c6224 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 ecff1546a5ac9..857774d401986 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 4fb66eecb5093..b7b28348a2edf 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 4d08d8b56f218..35343da1733a1 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 ab5b47c22d894..3694c28ce90f1 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 a5922ab733075..93db5b8a5b3a2 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 3296dcea69def..defc2c7e5887f 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 62666cc25106b..c2fa54f270a6f 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 a1d58a08d5d60..54fdf11610ca4 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 2532cf4fefe23..0312997abbf21 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 074e3000308be..9782399670e75 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" /* |