Merge branch 'swp' (early part) into for-next

[karo-tx-linux.git] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 6721fab13734daca10fd1d4050c196c7004fab84..718913dfe81597ae74e1cc1dfe163d9ff1c1ae70 100644 (file)
--- 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