summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 14:11:34 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 14:11:34 +0100
commit09fa31a322c8f03871a741cd1d26e5ca04aacbbd (patch)
treeacdad13d7c332978a91231c4f34b6320a1c7ceb6 /arch/arm/Makefile
parent2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff)
parentf37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff)
Merge branch 'dt/gic' into highbank/soc
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 70c424eaf7b..5665c2a3b65 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -128,6 +128,9 @@ textofs-$(CONFIG_PM_H1940) := 0x00108000
ifeq ($(CONFIG_ARCH_SA1100),y)
textofs-$(CONFIG_SA1111) := 0x00208000
endif
+textofs-$(CONFIG_ARCH_MSM7X30) := 0x00208000
+textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
+textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
# Machine directory name. This list is sorted alphanumerically
# by CONFIG_* macro name.