diff --git a/board/atum8548/atum8548.c b/board/atum8548/atum8548.c index 6ef663eeb0fb9a91ba351220ee36f35a2926f336..3e5da08eba040f3cce635881befcaa28336a96a5 100644 --- a/board/atum8548/atum8548.c +++ b/board/atum8548/atum8548.c @@ -28,7 +28,7 @@ #include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <asm/mmu.h> diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 31c1e1503af36e2d876932763b5ff5964e4a431e..88c6480d4151a792fdd9a40e36c78d1644f848e0 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -27,7 +27,7 @@ #include <asm/mmu.h> #include <asm/cache.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <spd.h> diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index 13760db78da46ded4bb13167ccb723346cf97818..4edf420d4c030a8321dd6f3c3c7a015364855885 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -26,7 +26,7 @@ #include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <miiphy.h> diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index efb2c5b8c2daa6362d9d86360e84c4c4906b6494..4d8c698adc3b0177f20ecc20a48cc18efd08fd2a 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -27,7 +27,7 @@ #include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <spd_sdram.h> #include <miiphy.h> diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index 97f465122bbca2ebc051e95009d3ea5c400e142f..c0e4f499965c8239dfb16c5236ffa48c3ef5cd23 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -27,7 +27,7 @@ #include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <spd_sdram.h> #include <i2c.h> diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index 53fef43f359096614ea928104daccddea65deff3..49a85462ddba50f69bcc7634a0b9d44aa9f1b12a 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -27,7 +27,7 @@ #include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <spd_sdram.h> diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 33cf0e49e4b047156ee40e93a62d03785f7a67dd..0542bf4ae1e6ac23894df9a8c9c99210e093a5a8 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -27,7 +27,7 @@ #include <asm/mmu.h> #include <asm/cache.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <miiphy.h> diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index b419dcc5b50ba17490dc6a15d79b2f073a9c7d48..1a6f8b421c21e6426809fda90a65aab39ee64243 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -25,7 +25,7 @@ #include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <i2c.h> #include <asm/io.h> diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index ef0095ab75fb391979f82c9db2e6ada94d870a23..0239abe5fe12ddd26db8bee4b30b3516fcbcdf8e 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -24,7 +24,7 @@ #include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <asm/io.h> #include <libfdt.h> diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 088f8045daa2d769c20f10748b14ca0060c39624..70b8119be2e3044c96e39f6fadabcdebcfd3bc8b 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -29,7 +29,7 @@ #include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <spd_sdram.h> #include <miiphy.h> diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index 9f696387eb29fe82cd47605f81f40d1f86718f39..ff489564af499be9b874d1b743f2c0d9a22eb839 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -33,7 +33,7 @@ #include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/fsl_ddr_sdram.h> #include <libfdt.h> #include <fdt_support.h> diff --git a/board/tqc/tqm85xx/tqm85xx.c b/board/tqc/tqm85xx/tqm85xx.c index e1e75b83abb67e571c9d017ff213035fea3aee1f..b96e7c2b922aa4553c8158f9cad735ec51a0710e 100644 --- a/board/tqc/tqm85xx/tqm85xx.c +++ b/board/tqc/tqm85xx/tqm85xx.c @@ -36,7 +36,7 @@ #include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/io.h> #include <ioports.h> #include <flash.h> diff --git a/board/xes/common/fsl_85xx_pci.c b/board/xes/common/fsl_85xx_pci.c index 9673a02b5baa7f20f91d6f31c68b137d55a4b5b4..683297cb29239b4f61648ad79a13f4b063e20bda 100644 --- a/board/xes/common/fsl_85xx_pci.c +++ b/board/xes/common/fsl_85xx_pci.c @@ -24,7 +24,7 @@ #include <common.h> #include <pci.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <libfdt.h> #include <fdt_support.h> diff --git a/board/xes/xpedite5200/xpedite5200.c b/board/xes/xpedite5200/xpedite5200.c index e266d1dd833e59d95f4023c8d8c3fd2548c5fb5f..77afdbcbf825eb5b358bc81285026c73ffa01210 100644 --- a/board/xes/xpedite5200/xpedite5200.c +++ b/board/xes/xpedite5200/xpedite5200.c @@ -26,7 +26,7 @@ #include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/io.h> #include <asm/cache.h> #include <asm/mmu.h> diff --git a/board/xes/xpedite5370/xpedite5370.c b/board/xes/xpedite5370/xpedite5370.c index 487509527fee032f81629603aef5179b76793cdd..22cf29431498475d2c0d646c05870f10b7f5e655 100644 --- a/board/xes/xpedite5370/xpedite5370.c +++ b/board/xes/xpedite5370/xpedite5370.c @@ -25,7 +25,7 @@ #include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> #include <asm/io.h> #include <asm/cache.h> #include <libfdt.h> diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index 20b2dcc767dde0e9b56d8b00b8ca6f7461261a21..19cf1ce1a04026b2793eea1ae708abe5805d61c3 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR; */ #include <pci.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> /* Freescale-specific PCI config registers */ #define FSL_PCI_PBFR 0x44 diff --git a/include/asm-ppc/immap_fsl_pci.h b/include/asm-ppc/fsl_pci.h similarity index 100% rename from include/asm-ppc/immap_fsl_pci.h rename to include/asm-ppc/fsl_pci.h