diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2007-07-06 19:39:48 -0500 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2007-07-06 19:39:48 -0500 |
| commit | 0459e7d3a0a273064b738aa2e06fd7dcd35eec58 (patch) | |
| tree | 83b8a3044400cb1463e91410cf0f3732dedd7fb4 /board/amcc/bamboo/bamboo.c | |
| parent | 30d5c04c93084fe0b144646b77eb873957872a8d (diff) | |
| parent | e80955f07de03fef0196353e77534b2300193c1c (diff) | |
| download | u-boot-imx-0459e7d3a0a273064b738aa2e06fd7dcd35eec58.zip u-boot-imx-0459e7d3a0a273064b738aa2e06fd7dcd35eec58.tar.gz u-boot-imx-0459e7d3a0a273064b738aa2e06fd7dcd35eec58.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'board/amcc/bamboo/bamboo.c')
| -rw-r--r-- | board/amcc/bamboo/bamboo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c index 2e651df..caf6690 100644 --- a/board/amcc/bamboo/bamboo.c +++ b/board/amcc/bamboo/bamboo.c @@ -416,7 +416,7 @@ int testdram(void) * certain pre-initialization actions. * ************************************************************************/ -#if defined(CONFIG_PCI) && defined(CFG_PCI_PRE_INIT) +#if defined(CONFIG_PCI) int pci_pre_init(struct pci_controller *hose) { unsigned long addr; @@ -457,7 +457,7 @@ int pci_pre_init(struct pci_controller *hose) return 1; } -#endif /* defined(CONFIG_PCI) && defined(CFG_PCI_PRE_INIT) */ +#endif /* defined(CONFIG_PCI) */ /************************************************************************* * pci_target_init |