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
Fix merge problems
[platform/kernel/u-boot.git]
/
board
/
esd
/
common
/
flash.c
diff --git
a/board/esd/common/flash.c
b/board/esd/common/flash.c
index
dca10be
..
bda361e
100644
(file)
--- a/
board/esd/common/flash.c
+++ b/
board/esd/common/flash.c
@@
-22,7
+22,9
@@
*/
#include <common.h>
+#ifdef __PPC__
#include <ppc4xx.h>
+#endif
#include <asm/processor.h>
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */