diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-04 20:05:18 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-04 20:05:18 +0200 |
| commit | 0a9403c8c753837a27b14ac33bc2b80d362c0e80 (patch) | |
| tree | 175f478e1ed24923334a79a0bfa15d9180805fdd /include | |
| parent | 42f9ebff2f758bef524780a00c712eb63a72d99b (diff) | |
| parent | e6a6789f41f0560ce280089fbd3f1bd0f0f64306 (diff) | |
| download | blackbird-obmc-uboot-0a9403c8c753837a27b14ac33bc2b80d362c0e80.tar.gz blackbird-obmc-uboot-0a9403c8c753837a27b14ac33bc2b80d362c0e80.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/fsl_pci.h (renamed from include/asm-ppc/immap_fsl_pci.h) | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/asm-ppc/immap_fsl_pci.h b/include/asm-ppc/fsl_pci.h index 6715064c94..624ca5685a 100644 --- a/include/asm-ppc/immap_fsl_pci.h +++ b/include/asm-ppc/fsl_pci.h @@ -17,8 +17,14 @@ * */ -#ifndef __IMMAP_85xx_fsl_pci__ -#define __IMMAP_85xx_fsl_pci__ +#ifndef __FSL_PCI_H_ +#define __FSL_PCI_H_ + +int fsl_pci_setup_inbound_windows(struct pci_region *r); +void fsl_pci_init(struct pci_controller *hose); +void fsl_pci_config_unlock(struct pci_controller *hose); +void ft_fsl_pci_setup(void *blob, const char *pci_alias, + struct pci_controller *hose); /* * Common PCI/PCIE Register structure for mpc85xx and mpc86xx @@ -149,4 +155,4 @@ typedef struct ccsr_pci { char res24[252]; } ccsr_fsl_pci_t; -#endif /*__IMMAP_fsl_pci__*/ +#endif |
