Merge branch 'linus' into x86/cleanups

[linux-2.6] / arch / arm / mach-s3c2412 / Makefile

diff --git a/arch/arm/mach-s3c2412/Makefile b/arch/arm/mach-s3c2412/Makefile
index 267f334..20918d5 100644 (file)
--- a/arch/arm/mach-s3c2412/Makefile
+++ b/arch/arm/mach-s3c2412/Makefile
@@ -18,5 +18,6 @@ obj-$(CONFIG_S3C2412_PM)      += pm.o sleep.o
 
 # Machine support
 
+obj-$(CONFIG_MACH_JIVE)                += mach-jive.o
 obj-$(CONFIG_MACH_SMDK2413)    += mach-smdk2413.o
 obj-$(CONFIG_MACH_VSTMS)       += mach-vstms.o