aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c6410/Makefile
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-05-07 11:06:32 +0100
committerBen Dooks <ben-linux@fluff.org>2009-05-07 11:06:32 +0100
commita19339f430d8ba5fc2ca840ae95f8aa7c49ea9d7 (patch)
tree439acb9b48371eafa2bcbd3efb03e483a3654931 /arch/arm/mach-s3c6410/Makefile
parent19e3f4858d4a2863ad66b2c92d0f9270879eac04 (diff)
parente3980b6a03e4c81e0e8d2cfcd7ab18082bbe92a5 (diff)
[ARM] Merge next-s3c-s3c6410 into for-rmk-devel
Merge branch 'next-s3c-s3c6410' into for-rmk-devel
Diffstat (limited to 'arch/arm/mach-s3c6410/Makefile')
-rw-r--r--arch/arm/mach-s3c6410/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/Makefile b/arch/arm/mach-s3c6410/Makefile
index 2cd4f189036..6f9deac8861 100644
--- a/arch/arm/mach-s3c6410/Makefile
+++ b/arch/arm/mach-s3c6410/Makefile
@@ -20,4 +20,8 @@ obj-$(CONFIG_S3C6410_SETUP_SDHCI) += setup-sdhci.o
# machine support
+obj-$(CONFIG_MACH_ANW6410) += mach-anw6410.o
obj-$(CONFIG_MACH_SMDK6410) += mach-smdk6410.o
+obj-$(CONFIG_MACH_NCP) += mach-ncp.o
+
+