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 /board/xes | |
| parent | 42f9ebff2f758bef524780a00c712eb63a72d99b (diff) | |
| parent | e6a6789f41f0560ce280089fbd3f1bd0f0f64306 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/xes')
| -rw-r--r-- | board/xes/common/fsl_85xx_pci.c | 9 | ||||
| -rw-r--r-- | board/xes/xpedite5200/xpedite5200.c | 2 | ||||
| -rw-r--r-- | board/xes/xpedite5370/xpedite5370.c | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/board/xes/common/fsl_85xx_pci.c b/board/xes/common/fsl_85xx_pci.c index 9673a02b5b..af34fe654e 100644 --- a/board/xes/common/fsl_85xx_pci.c +++ b/board/xes/common/fsl_85xx_pci.c @@ -24,14 +24,10 @@ #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> -extern int fsl_pci_setup_inbound_windows(struct pci_region *r); -extern void fsl_pci_config_unlock(struct pci_controller *hose); -extern void fsl_pci_init(struct pci_controller *hose); - int first_free_busno = 0; #ifdef CONFIG_PCI1 @@ -357,9 +353,6 @@ void pci_init_board(void) } #if defined(CONFIG_OF_BOARD_SETUP) -extern void ft_fsl_pci_setup(void *blob, const char *pci_alias, - struct pci_controller *hose); - void ft_board_pci_setup(void *blob, bd_t *bd) { /* TODO - make node name (eg pci0) dynamic */ diff --git a/board/xes/xpedite5200/xpedite5200.c b/board/xes/xpedite5200/xpedite5200.c index e266d1dd83..77afdbcbf8 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 487509527f..22cf294314 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> |