diff options
| author | Stefan Roese <sr@denx.de> | 2007-01-16 15:49:14 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-01-16 15:49:14 +0100 |
| commit | a195ff95ace5e74e50f54a469d1a160ff84a1089 (patch) | |
| tree | 562292b70faf3cc1298ef87a862658122c752804 /cpu/ppc4xx/405gp_pci.c | |
| parent | c2a6e9091fae9e8339c70f4b12cd3f7d5502ae0c (diff) | |
| parent | 1bbbbdd20fcec9933697000dcf55ff7972622596 (diff) | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'cpu/ppc4xx/405gp_pci.c')
| -rw-r--r-- | cpu/ppc4xx/405gp_pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/405gp_pci.c index 9b711e2ebf..38a1305d7f 100644 --- a/cpu/ppc4xx/405gp_pci.c +++ b/cpu/ppc4xx/405gp_pci.c @@ -380,7 +380,7 @@ void pci_405gp_setup_vga(struct pci_controller *hose, pci_dev_t dev, pci_hose_write_config_dword(hose, dev, PCI_COMMAND, cmdstat); } -#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) +#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) || defined (CONFIG_SOLIDCARD3) /* *As is these functs get called out of flash Not a horrible @@ -406,6 +406,7 @@ static struct pci_controller hose = { config_table: pci_405gp_config_table, }; +#ifndef CONFIG_SOLIDCARD3 void pci_init_board(void) { /*we want the ptrs to RAM not flash (ie don't use init list)*/ @@ -413,6 +414,7 @@ void pci_init_board(void) hose.config_table = pci_405gp_config_table; pci_405gp_init(&hose); } +#endif #endif |