commit | 3762825c0f00a3d524f32092ca16537b4d0dca87 | [log] [tgz] |
---|---|---|
author | Stefan Roese <sr@denx.de> | Wed Aug 06 14:05:38 2008 +0200 |
committer | Stefan Roese <sr@denx.de> | Wed Aug 06 14:05:38 2008 +0200 |
tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 | |
parent | ce5dcbfd9ab4794eb68d7a3f983054d45d06d46d [diff] [blame] |
Fix merge problems Signed-off-by: Stefan Roese <sr@denx.de>
diff --git a/include/configs/FADS860T.h b/include/configs/FADS860T.h index 18de6b0..38295c4 100644 --- a/include/configs/FADS860T.h +++ b/include/configs/FADS860T.h
@@ -38,7 +38,7 @@ #define CONFIG_DRAM_50MHZ 1 #define CONFIG_SDRAM_50MHZ 1 -#include "fads.h" +#include "../../board/fads/fads.h" #ifdef USE_REAL_FLASH_VALUES /*