Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / arch / arm / mach-s3c2410 / Makefile

diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 129e037..d660133 100644 (file)
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -22,7 +22,10 @@ obj-$(CONFIG_CPU_S3C2400)    += s3c2400-gpio.o
 
 obj-$(CONFIG_CPU_S3C2410)      += s3c2410.o
 obj-$(CONFIG_CPU_S3C2410)      += s3c2410-gpio.o
-obj-dma-$(CONFIG_CPU_S3C2410)  += s3c2410-dma.o
+obj-$(CONFIG_CPU_S3C2410)      += s3c2410-irq.o
+
+obj-$(CONFIG_S3C2410_PM)       += s3c2410-pm.o s3c2410-sleep.o
+obj-$(CONFIG_CPU_S3C2410_DMA)  += s3c2410-dma.o
 
 # Power Management support
 
@@ -33,6 +36,9 @@ obj-$(CONFIG_PM_SIMTEC)               += pm-simtec.o
 obj-$(CONFIG_CPU_S3C2412)      += s3c2412.o
 obj-$(CONFIG_CPU_S3C2412)      += s3c2412-irq.o
 obj-$(CONFIG_CPU_S3C2412)      += s3c2412-clock.o
+obj-dma-$(CONFIG_CPU_S3C2412)  += s3c2412-dma.o
+
+obj-$(CONFIG_S3C2412_PM)       += s3c2412-pm.o
 
 #
 # S3C244X support
@@ -67,6 +73,7 @@ obj-y                         += $(obj-dma-y)
 
 # machine specific support
 
+obj-$(CONFIG_MACH_AML_M5900)   += mach-amlm5900.o
 obj-$(CONFIG_MACH_ANUBIS)      += mach-anubis.o
 obj-$(CONFIG_MACH_OSIRIS)      += mach-osiris.o
 obj-$(CONFIG_ARCH_BAST)                += mach-bast.o usb-simtec.o
@@ -79,5 +86,6 @@ obj-$(CONFIG_MACH_VR1000)     += mach-vr1000.o usb-simtec.o
 obj-$(CONFIG_MACH_RX3715)      += mach-rx3715.o
 obj-$(CONFIG_MACH_OTOM)                += mach-otom.o
 obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
+obj-$(CONFIG_MACH_VSTMS)       += mach-vstms.o
 
 obj-$(CONFIG_MACH_SMDK)                += common-smdk.o
\ No newline at end of file