diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 11:01:05 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 11:01:05 +0100 |
| commit | 06099961002a813324d057a91695af7c72939da6 (patch) | |
| tree | d55ee7a8833c95ee2afb6914bb8a2977cbb9fa31 /arch/arm/Makefile | |
| parent | 4c31791c3d9d38ac052dd5e2981df713d8f3dcc4 (diff) | |
| parent | c11c22177ae2929598051a39e4655be4a42cb805 (diff) | |
| download | talos-op-linux-06099961002a813324d057a91695af7c72939da6.tar.gz talos-op-linux-06099961002a813324d057a91695af7c72939da6.zip | |
Merge branch 'stmp' into devel
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 3 |
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 machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 machine-$(CONFIG_ARCH_SA1100) := sa1100 machine-$(CONFIG_ARCH_SHARK) := shark +machine-$(CONFIG_ARCH_STMP378X) := stmp378x +machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx machine-$(CONFIG_ARCH_VERSATILE) := versatile machine-$(CONFIG_ARCH_W90X900) := w90x900 machine-$(CONFIG_FOOTBRIDGE) := footbridge @@ -165,6 +167,7 @@ plat-$(CONFIG_PLAT_ORION) := orion plat-$(CONFIG_PLAT_PXA) := pxa plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c +plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx ifeq ($(CONFIG_ARCH_EBSA110),y) # This is what happens if you forget the IOCS16 line. |
