summaryrefslogtreecommitdiff
path: root/board/xpedite1k/xpedite1k.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-07-04 08:11:37 +0200
committerStefan Roese <sr@denx.de>2007-07-04 08:11:37 +0200
commit8e990cb076a1c77daf3a50cc0df9732135e9eef5 (patch)
tree3b860d74bb4ddc5e0c9485e44da1bc0a08ed839c /board/xpedite1k/xpedite1k.c
parentd677b32855f577ae2690dcd64a172cdd706e0ffc (diff)
parent98c440bee623ecdd5322852732b883e696fb2140 (diff)
downloadu-boot-imx-8e990cb076a1c77daf3a50cc0df9732135e9eef5.zip
u-boot-imx-8e990cb076a1c77daf3a50cc0df9732135e9eef5.tar.gz
u-boot-imx-8e990cb076a1c77daf3a50cc0df9732135e9eef5.tar.bz2
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/xpedite1k/xpedite1k.c')
-rw-r--r--board/xpedite1k/xpedite1k.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/xpedite1k/xpedite1k.c b/board/xpedite1k/xpedite1k.c
index a569b53..8411cf0 100644
--- a/board/xpedite1k/xpedite1k.c
+++ b/board/xpedite1k/xpedite1k.c
@@ -209,7 +209,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;
@@ -227,7 +227,7 @@ int pci_pre_init(struct pci_controller * hose )
#endif
return 1;
}
-#endif /* defined(CONFIG_PCI) && defined(CFG_PCI_PRE_INIT) */
+#endif /* defined(CONFIG_PCI) */
/*************************************************************************
* pci_target_init