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 /include/configs/MPC885ADS.h | |
parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
download | u-boot-midas-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz u-boot-midas-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.bz2 u-boot-midas-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/MPC885ADS.h')
-rw-r--r-- | include/configs/MPC885ADS.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/MPC885ADS.h b/include/configs/MPC885ADS.h index 1867c5bf0a..f4d1842771 100644 --- a/include/configs/MPC885ADS.h +++ b/include/configs/MPC885ADS.h @@ -27,7 +27,7 @@ #define CONFIG_SDRAM_50MHZ 1 -#include "fads.h" +#include "../../board/fads/fads.h" #define CFG_OR5_PRELIM 0xFFFF8110 /* 64Kbyte address space */ #define CFG_BR5_PRELIM (CFG_PHYDEV_ADDR | BR_PS_8 | BR_V) |