Merge branch 'master' of git://git.denx.de/u-boot-video

[oweals/u-boot.git] / arch / arm / include / asm / config.h

diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h
index 7a34a0186cb1cd255aee62b8d992756536fc3fd9..435fc4521c2e1198ba49f13d8c5cc743236e0a2b 100644 (file)
--- a/arch/arm/include/asm/config.h
+++ b/arch/arm/include/asm/config.h
@@ -15,11 +15,11 @@
 #define CONFIG_STATIC_RELA
 #endif
 
-#ifdef CONFIG_FSL_LSCH3
-#include <asm/arch-fsl-lsch3/config.h>
-#endif
-
-#ifdef CONFIG_LS102XA
+#if defined(CONFIG_LS102XA) || \
+       defined(CONFIG_CPU_PXA27X) || \
+       defined(CONFIG_CPU_MONAHANS) || \
+       defined(CONFIG_CPU_PXA25X) || \
+       defined(CONFIG_FSL_LAYERSCAPE)
 #include <asm/arch/config.h>
 #endif