diff options
author | Markus Klotzbuecher <mk@denx.de> | 2007-08-07 22:30:29 +0200 |
---|---|---|
committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-08-07 22:30:29 +0200 |
commit | 78549bbf44bd2c8d1a0730fb068836071751afaa (patch) | |
tree | 92f002dc9772874bc3c884b1caa5607763c2c276 /board/sandburst/common/sb_common.c | |
parent | 9b7464a2c88614e1061f509c48930a3d240d1a35 (diff) | |
parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
download | u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.zip u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.tar.gz u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.tar.bz2 |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/sandburst/common/sb_common.c')
-rw-r--r-- | board/sandburst/common/sb_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/sandburst/common/sb_common.c b/board/sandburst/common/sb_common.c index 7816472..8a831fa 100644 --- a/board/sandburst/common/sb_common.c +++ b/board/sandburst/common/sb_common.c @@ -313,7 +313,7 @@ long int fixed_sdram (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 strap; @@ -330,7 +330,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 |