commit e702146ee5738c49355bce4f5c35cb080f71e6f5
author Masahiro Yamada <yamada.masahiro@socionext.com> Tue Apr 21 21:59:38 2015 +0900
committer Tom Rini <trini@konsulko.com> Thu Apr 23 08:52:27 2015 -0400
tree 68a5a1fccdfd2c81ed8d87eb5b6b9b3535192f04
parent 9ef851f890c7ecb42bde06a55781b992224ef442

ARM: integrator: abolish CONFIG_INTEGRATOR

Switch to CONFIG_ARCH_INTEGRATOR defined by Kconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>

arch/arm/cpu/arm946es/cpu.c

diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c
index e20e5a8..5d864b9 100644
--- a/arch/arm/cpu/arm946es/cpu.c
+++ b/arch/arm/cpu/arm946es/cpu.c
@@ -53,7 +53,7 @@
 	asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (i));
 }
 
-#ifndef CONFIG_INTEGRATOR
+#ifndef CONFIG_ARCH_INTEGRATOR
 
 __attribute__((noreturn)) void reset_cpu(ulong addr __attribute__((unused)))
 {
@@ -63,4 +63,4 @@
 		;
 }
 
-#endif	/* #ifdef CONFIG_INTEGRATOR */
+#endif	/* #ifdef CONFIG_ARCH_INTEGRATOR */