diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-07 22:17:19 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-07 22:17:19 +0100 |
| commit | e70ef33b6b57a37d56745904495fe298d2ecf03b (patch) | |
| tree | 5d701c80f67d704c3e8f78b4c450d97f2da47caa /cpu/ppc4xx/4xx_pci.c | |
| parent | 1b33a62bf9301f9e1611a44865bf3d2c51198993 (diff) | |
| parent | 59d1bda7f92c8a28c3aba94e48063749d425949f (diff) | |
| download | u-boot-imx-e70ef33b6b57a37d56745904495fe298d2ecf03b.zip u-boot-imx-e70ef33b6b57a37d56745904495fe298d2ecf03b.tar.gz u-boot-imx-e70ef33b6b57a37d56745904495fe298d2ecf03b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'cpu/ppc4xx/4xx_pci.c')
| -rw-r--r-- | cpu/ppc4xx/4xx_pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpu/ppc4xx/4xx_pci.c b/cpu/ppc4xx/4xx_pci.c index e8871fc..2e75886 100644 --- a/cpu/ppc4xx/4xx_pci.c +++ b/cpu/ppc4xx/4xx_pci.c @@ -588,8 +588,9 @@ void pci_init_board(void) int busno; busno = pci_440_init (&ppc440_hose); -#if defined(CONFIG_440SPE) || \ - defined(CONFIG_460EX) || defined(CONFIG_460GT) +#if (defined(CONFIG_440SPE) || \ + defined(CONFIG_460EX) || defined(CONFIG_460GT)) && \ + !defined(CONFIG_PCI_DISABLE_PCIE) pcie_setup_hoses(busno + 1); #endif } |