diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-11 23:54:37 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-11 23:54:37 +0200 |
| commit | 7e2a24dca9a3213f0b4941562e4387e20bec3e2d (patch) | |
| tree | d04e0a5852637f365621cea6691c78d3d5e55d3d /cpu | |
| parent | fb883a521e04437acfe989de3e152b2e4866856b (diff) | |
| parent | 7376eb87aaa601f728f9b8e5e9cd2711a67f529e (diff) | |
Merge with http://opensource.freescale.com/pub/scm/u-boot-85xx.git#for_wd
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc85xx/pci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpu/mpc85xx/pci.c b/cpu/mpc85xx/pci.c index cfb7dcd..84f839a 100644 --- a/cpu/mpc85xx/pci.c +++ b/cpu/mpc85xx/pci.c @@ -29,6 +29,9 @@ #include <asm/cpm_85xx.h> #include <pci.h> +#if defined(CONFIG_OF_FLAT_TREE) +#include <ft_build.h> +#endif #if defined(CONFIG_PCI) @@ -42,7 +45,9 @@ pci_mpc85xx_init(struct pci_controller *board_hose) volatile immap_t *immap = (immap_t *)CFG_CCSRBAR; volatile ccsr_pcix_t *pcix = &immap->im_pcix; +#ifdef CONFIG_MPC85XX_PCI2 volatile ccsr_pcix_t *pcix2 = &immap->im_pcix2; +#endif volatile ccsr_gur_t *gur = &immap->im_gur; struct pci_controller * hose; |