diff options
| author | Zbigniew Bodek <zbb@FreeBSD.org> | 2016-03-29 15:19:56 +0000 |
|---|---|---|
| committer | Zbigniew Bodek <zbb@FreeBSD.org> | 2016-03-29 15:19:56 +0000 |
| commit | c43a86743cf3e0fd87fbe84241056089c14a3848 (patch) | |
| tree | b0ba83207bab9525934dc8eaed7ce4eb918ad758 /sys/powerpc | |
| parent | 35030a5dd4d434af4975c0948c93ce3842fa3809 (diff) | |
Notes
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/mpc85xx/pci_mpc85xx.c | 3 | ||||
| -rw-r--r-- | sys/powerpc/powermac/cpcht.c | 2 | ||||
| -rw-r--r-- | sys/powerpc/powermac/grackle.c | 5 | ||||
| -rw-r--r-- | sys/powerpc/powermac/uninorthpci.c | 5 | ||||
| -rw-r--r-- | sys/powerpc/powermac/uninorthvar.h | 2 | ||||
| -rw-r--r-- | sys/powerpc/pseries/rtas_pci.c | 5 |
6 files changed, 9 insertions, 13 deletions
diff --git a/sys/powerpc/mpc85xx/pci_mpc85xx.c b/sys/powerpc/mpc85xx/pci_mpc85xx.c index 4397ac0ad778..5a141b6875ae 100644 --- a/sys/powerpc/mpc85xx/pci_mpc85xx.c +++ b/sys/powerpc/mpc85xx/pci_mpc85xx.c @@ -58,12 +58,11 @@ __FBSDID("$FreeBSD$"); #include <dev/ofw/ofw_pci.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> +#include <dev/ofw/ofwpci.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcib_private.h> -#include <powerpc/ofw/ofw_pci.h> - #include "ofw_bus_if.h" #include "pcib_if.h" diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c index 765d94624cd0..3145689f3c41 100644 --- a/sys/powerpc/powermac/cpcht.c +++ b/sys/powerpc/powermac/cpcht.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <powerpc/ofw/ofw_pci.h> +#include <dev/ofw/ofwpci.h> #include <vm/vm.h> #include <vm/pmap.h> diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c index 95d59a1ca744..3d35fea1d69d 100644 --- a/sys/powerpc/powermac/grackle.c +++ b/sys/powerpc/powermac/grackle.c @@ -35,11 +35,13 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/kernel.h> #include <sys/proc.h> +#include <sys/rman.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_pci.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> +#include <dev/ofw/ofwpci.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> @@ -50,9 +52,6 @@ __FBSDID("$FreeBSD$"); #include <machine/pio.h> #include <machine/resource.h> -#include <sys/rman.h> - -#include <powerpc/ofw/ofw_pci.h> #include <powerpc/powermac/gracklevar.h> #include <vm/vm.h> diff --git a/sys/powerpc/powermac/uninorthpci.c b/sys/powerpc/powermac/uninorthpci.c index 9da06ffe10de..6149af5254cd 100644 --- a/sys/powerpc/powermac/uninorthpci.c +++ b/sys/powerpc/powermac/uninorthpci.c @@ -32,11 +32,13 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/conf.h> #include <sys/kernel.h> +#include <sys/rman.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_pci.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> +#include <dev/ofw/ofwpci.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> @@ -47,9 +49,6 @@ __FBSDID("$FreeBSD$"); #include <machine/pio.h> #include <machine/resource.h> -#include <sys/rman.h> - -#include <powerpc/ofw/ofw_pci.h> #include <powerpc/powermac/uninorthvar.h> #include <vm/vm.h> diff --git a/sys/powerpc/powermac/uninorthvar.h b/sys/powerpc/powermac/uninorthvar.h index e08478d7580b..e570da045464 100644 --- a/sys/powerpc/powermac/uninorthvar.h +++ b/sys/powerpc/powermac/uninorthvar.h @@ -30,7 +30,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_pci.h> -#include <powerpc/ofw/ofw_pci.h> +#include <dev/ofw/ofwpci.h> struct uninorth_softc { struct ofw_pci_softc pci_sc; diff --git a/sys/powerpc/pseries/rtas_pci.c b/sys/powerpc/pseries/rtas_pci.c index bb72b710e7b5..873168e2612a 100644 --- a/sys/powerpc/pseries/rtas_pci.c +++ b/sys/powerpc/pseries/rtas_pci.c @@ -32,11 +32,13 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/conf.h> #include <sys/kernel.h> +#include <sys/rman.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_pci.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> +#include <dev/ofw/ofwpci.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> @@ -48,12 +50,9 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <machine/rtas.h> -#include <sys/rman.h> - #include <vm/vm.h> #include <vm/pmap.h> -#include <powerpc/ofw/ofw_pci.h> #include <powerpc/pseries/plpar_iommu.h> #include "pcib_if.h" |