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/MPC86xADS.h | |
| 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 'include/configs/MPC86xADS.h')
| -rw-r--r-- | include/configs/MPC86xADS.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/MPC86xADS.h b/include/configs/MPC86xADS.h index e0e8554..233a8d1 100644 --- a/include/configs/MPC86xADS.h +++ b/include/configs/MPC86xADS.h @@ -41,7 +41,7 @@ #define CONFIG_DRAM_50MHZ 1 #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) |