aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-14 06:01:05 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-14 06:01:05 -0400
commit06099961002a813324d057a91695af7c72939da6 (patch)
treed55ee7a8833c95ee2afb6914bb8a2977cbb9fa31 /arch/arm/Makefile
parent4c31791c3d9d38ac052dd5e2981df713d8f3dcc4 (diff)
parentc11c22177ae2929598051a39e4655be4a42cb805 (diff)
Merge branch 'stmp' into devel
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 0c25f2cb73a1..2f3cac809e31 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -152,6 +152,8 @@ machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
152machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 152machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410
153machine-$(CONFIG_ARCH_SA1100) := sa1100 153machine-$(CONFIG_ARCH_SA1100) := sa1100
154machine-$(CONFIG_ARCH_SHARK) := shark 154machine-$(CONFIG_ARCH_SHARK) := shark
155machine-$(CONFIG_ARCH_STMP378X) := stmp378x
156machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx
155machine-$(CONFIG_ARCH_VERSATILE) := versatile 157machine-$(CONFIG_ARCH_VERSATILE) := versatile
156machine-$(CONFIG_ARCH_W90X900) := w90x900 158machine-$(CONFIG_ARCH_W90X900) := w90x900
157machine-$(CONFIG_FOOTBRIDGE) := footbridge 159machine-$(CONFIG_FOOTBRIDGE) := footbridge
@@ -165,6 +167,7 @@ plat-$(CONFIG_PLAT_ORION) := orion
165plat-$(CONFIG_PLAT_PXA) := pxa 167plat-$(CONFIG_PLAT_PXA) := pxa
166plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c 168plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c
167plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c 169plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c
170plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx
168 171
169ifeq ($(CONFIG_ARCH_EBSA110),y) 172ifeq ($(CONFIG_ARCH_EBSA110),y)
170# This is what happens if you forget the IOCS16 line. 173# This is what happens if you forget the IOCS16 line.