summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-15 13:45:59 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-15 13:45:59 +0200
commit91d0322bef047e2916b3e52741411bffc63929cb (patch)
tree44c4fd13cc17755a6db8a3d70cffb86e57a838dc /arch/arm/mach-s3c2440/Makefile
parent065cb3dfe24978651caedfa54da585388ad15dde (diff)
parent50515af207d410c9f228380e529c56f43c3de0bd (diff)
downloadtalos-op-linux-91d0322bef047e2916b3e52741411bffc63929cb.tar.gz
talos-op-linux-91d0322bef047e2916b3e52741411bffc63929cb.zip
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/arm/mach-s3c2440/Makefile')
-rw-r--r--arch/arm/mach-s3c2440/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
index c81ed6248dcb..0b4440e79b90 100644
--- a/arch/arm/mach-s3c2440/Makefile
+++ b/arch/arm/mach-s3c2440/Makefile
@@ -21,3 +21,4 @@ obj-$(CONFIG_MACH_OSIRIS) += mach-osiris.o
obj-$(CONFIG_MACH_RX3715) += mach-rx3715.o
obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
+obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o
OpenPOWER on IntegriCloud