diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
| commit | f2302d4430e7f3f48308d6a585320fe96af8afbd (patch) | |
| tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 /board/esd | |
| parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
| download | u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.bz2 | |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/esd')
| -rw-r--r-- | board/esd/common/flash.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/board/esd/common/flash.c b/board/esd/common/flash.c index dca10be..bda361e 100644 --- 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 */ |