| 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/ADS860.h b/include/configs/ADS860.h index 2ee8c61..f677b9c 100644 --- a/include/configs/ADS860.h +++ b/include/configs/ADS860.h
@@ -51,7 +51,7 @@ /* This is picked up again in fads.h */ #define FADS_COMMANDS_ALREADY_DEFINED -#include "fads.h" +#include "../../board/fads/fads.h" #define CFG_PC_IDE_RESET ((ushort)0x0008) /* PC 12 */