diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-30 22:45:55 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-30 22:45:55 +0200 |
| commit | aeabdeb7a33c9cff9ae0cd804521d0d691a7c341 (patch) | |
| tree | 2979428a02f5eebf256d18a3fb5839e063c3354a /arch/powerpc/include/asm/fsl_pci.h | |
| parent | f3c615b8abc098f5222b061b81c75f1363ff4d32 (diff) | |
| parent | a2879634c430df3d308f4a3badb37cddca0328f5 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/include/asm/fsl_pci.h')
| -rw-r--r-- | arch/powerpc/include/asm/fsl_pci.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h index 82d75bef6a..fc47a9f7ec 100644 --- a/arch/powerpc/include/asm/fsl_pci.h +++ b/arch/powerpc/include/asm/fsl_pci.h @@ -230,7 +230,9 @@ int fsl_pcie_init_board(int busno); #define FT_FSL_PCIE3_SETUP __FT_FSL_PCIE_SETUP(blob, FSL_PCIE_COMPAT, 3) #define FT_FSL_PCIE4_SETUP __FT_FSL_PCIE_SETUP(blob, FSL_PCIE_COMPAT, 4) -#if defined(CONFIG_FSL_CORENET) +#if !defined(CONFIG_PCI) +#define FT_FSL_PCI_SETUP +#elif defined(CONFIG_FSL_CORENET) #define FSL_PCIE_COMPAT "fsl,p4080-pcie" #define FT_FSL_PCI_SETUP \ FT_FSL_PCIE1_SETUP; \ |