Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / cell / Makefile

diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index e570bad063940f61d034dacf91f11a49615268cd..869af89df6ffe0daaee14ed9f4bda25eecb3247d 100644 (file)
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -1,16 +1,25 @@
-obj-y                  += interrupt.o iommu.o setup.o spider-pic.o
-obj-y                  += pervasive.o
+obj-$(CONFIG_PPC_CELL_NATIVE)          += interrupt.o iommu.o setup.o \
+                                          cbe_regs.o spider-pic.o \
+                                          pervasive.o pmu.o io-workarounds.o
+obj-$(CONFIG_CBE_RAS)                  += ras.o
 
-obj-$(CONFIG_SMP)      += smp.o
-obj-$(CONFIG_SPU_FS)   += spu-base.o spufs/
+obj-$(CONFIG_CBE_THERM)                        += cbe_thermal.o
+obj-$(CONFIG_CBE_CPUFREQ)              += cbe_cpufreq.o
 
-spu-base-y             += spu_base.o spu_priv1.o
+ifeq ($(CONFIG_SMP),y)
+obj-$(CONFIG_PPC_CELL_NATIVE)          += smp.o
+endif
 
 # needed only when building loadable spufs.ko
-spufs-modular-$(CONFIG_SPU_FS) += spu_syscalls.o
-obj-y                  += $(spufs-modular-m)
+spufs-modular-$(CONFIG_SPU_FS)         += spu_syscalls.o
+spu-priv1-$(CONFIG_PPC_CELL_NATIVE)    += spu_priv1_mmio.o
 
-# always needed in kernel
-spufs-builtin-$(CONFIG_SPU_FS) += spu_callbacks.o
-obj-y                  += $(spufs-builtin-y) $(spufs-builtin-m)
+spu-manage-$(CONFIG_PPC_CELLEB)                += spu_manage.o
+spu-manage-$(CONFIG_PPC_CELL_NATIVE)   += spu_manage.o
 
+obj-$(CONFIG_SPU_BASE)                 += spu_callbacks.o spu_base.o \
+                                          spu_coredump.o \
+                                          $(spufs-modular-m) \
+                                          $(spu-priv1-y) \
+                                          $(spu-manage-y) \
+                                          spufs/