summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos4/Makefile
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-10-04 13:20:21 +0200
committerKukjin Kim <kgene.kim@samsung.com>2011-10-04 13:20:21 +0200
commita1a9107deff9b9e5c615058834b74717fa87d49c (patch)
tree70686e34b8676a812a5cc63059e4ae8343ee1df1 /arch/arm/mach-exynos4/Makefile
parentMerge branch 'next-samsung-cleanup-2' into next-samsung-devel-2 (diff)
parentARM: EXYNOS4: Add support SMDK4412 Board (diff)
downloadlinux-a1a9107deff9b9e5c615058834b74717fa87d49c.tar.xz
linux-a1a9107deff9b9e5c615058834b74717fa87d49c.zip
Merge branch 'next-samsung-board-2' into next-samsung-devel-2
Diffstat (limited to 'arch/arm/mach-exynos4/Makefile')
-rw-r--r--arch/arm/mach-exynos4/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
index e19cd12d264e..c9b2e1f97e44 100644
--- a/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@ -34,7 +34,8 @@ obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o
obj-$(CONFIG_MACH_NURI) += mach-nuri.o
obj-$(CONFIG_MACH_ORIGEN) += mach-origen.o
-obj-$(CONFIG_MACH_SMDK4212) += mach-smdk4212.o
+obj-$(CONFIG_MACH_SMDK4212) += mach-smdk4x12.o
+obj-$(CONFIG_MACH_SMDK4412) += mach-smdk4x12.o
# device support