commit 8204bd19c9684c7f5393b4b5a654e59f8dfae8e6
author Masahiro Yamada <yamada.masahiro@socionext.com> Mon Mar 16 16:43:24 2015 +0900
committer Michal Simek <michal.simek@xilinx.com> Wed Apr 29 11:19:05 2015 +0200
tree 1137c77258dbe904d630ba36d8d7902fe3970ce6
parent 5ab14c3b983abd4bbf7b751c4834b04a0d6152b4

ARM: zynq: rename CONFIG_ZYNQ to CONFIG_ARCH_ZYNQ

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

arch/arm/Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5705d64..2a5620d 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -55,7 +55,7 @@
 machine-$(CONFIG_TEGRA)			+= tegra
 machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
 machine-$(CONFIG_ARCH_VERSATILE)	+= versatile
-machine-$(CONFIG_ZYNQ)			+= zynq
+machine-$(CONFIG_ARCH_ZYNQ)		+= zynq
 
 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))