projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync'd u-boot-net with mainline
[oweals/u-boot.git]
/
board
/
amcc
/
yucca
/
yucca.c
diff --git
a/board/amcc/yucca/yucca.c
b/board/amcc/yucca/yucca.c
index 90eaab1c80befc58c2ffa5ee782df9095a4640c4..7316c34b4a7d8adc1a5de0e853579d7d464d6a38 100644
(file)
--- a/
board/amcc/yucca/yucca.c
+++ b/
board/amcc/yucca/yucca.c
@@
-604,7
+604,7
@@
int testdram (void)
* certain pre-initialization actions.
*
************************************************************************/
* 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;
int pci_pre_init(struct pci_controller * hose )
{
unsigned long strap;
@@
-621,7
+621,7
@@
int pci_pre_init(struct pci_controller * hose )
return 1;
}
return 1;
}
-#endif /* defined(CONFIG_PCI)
&& defined(CFG_PCI_PRE_INIT)
*/
+#endif /* defined(CONFIG_PCI) */
/*************************************************************************
* pci_target_init
/*************************************************************************
* pci_target_init