From f2302d4430e7f3f48308d6a585320fe96af8afbd Mon Sep 17 00:00:00 2001
From: Stefan Roese <sr@denx.de>
Date: Wed, 6 Aug 2008 14:05:38 +0200
Subject: Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>
---
 include/configs/ADS860.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/configs/ADS860.h')

diff --git a/include/configs/ADS860.h b/include/configs/ADS860.h
index 2ee8c61cea..f677b9c80a 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	*/
 
-- 
cgit