Fix merge problems

[karo-tx-uboot.git] / board / esd / common / flash.c

diff --git a/board/esd/common/flash.c b/board/esd/common/flash.c
index dca10be1b5ac31a78dd569be906777a0aca80867..bda361ead949ec5c63988729e6b3cd9f2ab15c1c 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        */