Merge branch 'master' of /home/wd/git/u-boot/master/

diff --git a/include/configs/ADS860.h b/include/configs/ADS860.h
index 2ee8c61cea45874adf12f41620dd2f5941f5f889..f677b9c80a1c6bf4454a1fa9a76dddfb1bcdfe45 100644 (file)
--- 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    */