summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@linaro.org>2014-04-01 05:01:09 +0200
committerOlof Johansson <olof@lixom.net>2014-07-31 07:32:19 +0200
commit7685b125ca84a2da9c7a43578c3081cd209c2ac3 (patch)
treecde77f347115730a4b5b519f65734548c9430dad /arch/arm/Makefile
parentMerge tag 'for-3.17/bcm-soc' of git://github.com/broadcom/mach-bcm into next/soc (diff)
downloadlinux-7685b125ca84a2da9c7a43578c3081cd209c2ac3.tar.xz
linux-7685b125ca84a2da9c7a43578c3081cd209c2ac3.zip
ARM: hisi: add ARCH_HISI
Since multiple ARCH configuration will be appended into mach-hisi directory, add ARCH_HISI as common configuration for different platforms in mach-hisi. Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> Acked-by: Wei Xu <xuwei5@hisilicon.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index a1e21e81b7aa..14c7e4a541c8 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -156,7 +156,7 @@ machine-$(CONFIG_ARCH_EP93XX) += ep93xx
machine-$(CONFIG_ARCH_EXYNOS) += exynos
machine-$(CONFIG_ARCH_GEMINI) += gemini
machine-$(CONFIG_ARCH_HIGHBANK) += highbank
-machine-$(CONFIG_ARCH_HI3xxx) += hisi
+machine-$(CONFIG_ARCH_HISI) += hisi
machine-$(CONFIG_ARCH_INTEGRATOR) += integrator
machine-$(CONFIG_ARCH_IOP13XX) += iop13xx
machine-$(CONFIG_ARCH_IOP32X) += iop32x