Fix merge problems

[karo-tx-uboot.git] / include / configs / MPC86xADS.h

diff --git a/include/configs/MPC86xADS.h b/include/configs/MPC86xADS.h
index 831cc5ecd3258f05138e34bd96dcd57638ee9dc3..233a8d19fa9db0d3600b66a9e9ed672d2aadf296 100644 (file)
--- a/include/configs/MPC86xADS.h
+++ b/include/configs/MPC86xADS.h
@@ -22,7 +22,7 @@
 #define CONFIG_FADS            1       /* We are FADS compatible (more or less) */
 
 /* CPU type - pick one of these */
-#define CONFIG_MPC866T                 1
+#define CONFIG_MPC866T         1
 #undef CONFIG_MPC866P
 #undef CONFIG_MPC859T
 #undef CONFIG_MPC859DSL
@@ -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)