summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-04-21 21:59:38 +0900
committerTom Rini <trini@konsulko.com>2015-04-23 08:52:27 -0400
commite702146ee5738c49355bce4f5c35cb080f71e6f5 (patch)
tree68a5a1fccdfd2c81ed8d87eb5b6b9b3535192f04 /arch/arm
parent9ef851f890c7ecb42bde06a55781b992224ef442 (diff)
downloadu-boot-imx-e702146ee5738c49355bce4f5c35cb080f71e6f5.zip
u-boot-imx-e702146ee5738c49355bce4f5c35cb080f71e6f5.tar.gz
u-boot-imx-e702146ee5738c49355bce4f5c35cb080f71e6f5.tar.bz2
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/arm946es/cpu.c4
1 files changed, 2 insertions, 2 deletions
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 @@ static void cache_flush (void)
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 @@ __attribute__((noreturn)) void reset_cpu(ulong addr __attribute__((unused)))
;
}
-#endif /* #ifdef CONFIG_INTEGRATOR */
+#endif /* #ifdef CONFIG_ARCH_INTEGRATOR */