diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-17 13:16:28 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-17 13:16:28 -0400 |
commit | 29c08460d472e427cec5e5dcb12ec74c923f8250 (patch) | |
tree | 9d8557fe9cf123920c3ceb023274e763e5f208b0 /arch/arm/Makefile | |
parent | 9b2616c2e8cc98ca98bbb40cad83a8d3d859e840 (diff) | |
parent | baa28e3530375e0bef2c53243634a1c78f5c02f3 (diff) |
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8f117acd98e9..3de196e2a7a7 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -158,6 +158,7 @@ machine-$(CONFIG_ARCH_RPC) := rpc | |||
158 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 | 158 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 |
159 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 | 159 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 |
160 | machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 | 160 | machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 |
161 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 | ||
161 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 162 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
162 | machine-$(CONFIG_ARCH_SHARK) := shark | 163 | machine-$(CONFIG_ARCH_SHARK) := shark |
163 | machine-$(CONFIG_ARCH_STMP378X) := stmp378x | 164 | machine-$(CONFIG_ARCH_STMP378X) := stmp378x |
@@ -177,6 +178,7 @@ plat-$(CONFIG_PLAT_ORION) := orion | |||
177 | plat-$(CONFIG_PLAT_PXA) := pxa | 178 | plat-$(CONFIG_PLAT_PXA) := pxa |
178 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c | 179 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c |
179 | plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c | 180 | plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c |
181 | plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c | ||
180 | plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx | 182 | plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx |
181 | 183 | ||
182 | ifeq ($(CONFIG_ARCH_EBSA110),y) | 184 | ifeq ($(CONFIG_ARCH_EBSA110),y) |