X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Farm%2FMakefile;h=0ce9d0f71f2a318c240e60ab019d155dc94e6925;hb=d27c0d90184a13e9e9f28c38e84f889a259f6b5f;hp=a1e21e81b7aa4e688d949b70d6fa42e65fa1d728;hpb=21b9554e7b5388c84400334683e6e4cc821bdb3e;p=deliverable%2Flinux.git

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index a1e21e81b7aa..0ce9d0f71f2a 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -127,6 +127,9 @@ CHECKFLAGS	+= -D__arm__
 
 #Default value
 head-y		:= arch/arm/kernel/head$(MMUEXT).o
+
+# Text offset. This list is sorted numerically by address in order to
+# provide a means to avoid/resolve conflicts in multi-arch kernels.
 textofs-y	:= 0x00008000
 textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
 # We don't want the htc bootloader to corrupt kernel during resume
@@ -156,7 +159,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