diff options
| author | Stefan Roese <sr@denx.de> | 2007-07-04 08:11:37 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-07-04 08:11:37 +0200 |
| commit | 8e990cb076a1c77daf3a50cc0df9732135e9eef5 (patch) | |
| tree | 3b860d74bb4ddc5e0c9485e44da1bc0a08ed839c /board/lwmon5/lwmon5.c | |
| parent | d677b32855f577ae2690dcd64a172cdd706e0ffc (diff) | |
| parent | 98c440bee623ecdd5322852732b883e696fb2140 (diff) | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/lwmon5/lwmon5.c')
| -rw-r--r-- | board/lwmon5/lwmon5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c index b303ec7cb3..d5b8f8c81b 100644 --- a/board/lwmon5/lwmon5.c +++ b/board/lwmon5/lwmon5.c @@ -304,7 +304,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; @@ -345,7 +345,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 |