projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
cpu
/
ixp
/
cpu.c
diff --git
a/cpu/ixp/cpu.c
b/cpu/ixp/cpu.c
index
7f9f334
..
2c7d5a0
100644
(file)
--- a/
cpu/ixp/cpu.c
+++ b/
cpu/ixp/cpu.c
@@
-85,7
+85,7
@@
int cpu_init (void)
FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
#endif
FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_PCI) || defined (CONFIG_PCI)
+#if
defined(CONFI
G_CMD_PCI) || defined (CONFIG_PCI)
pci_init();
#endif
return 0;
pci_init();
#endif
return 0;