Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / cell / spufs / Makefile

diff --git a/arch/powerpc/platforms/cell/spufs/Makefile b/arch/powerpc/platforms/cell/spufs/Makefile
index 328afcf895032e50a7f36b0a7f00a38d3ca7aade..99610a6361f28133e1eff58c32d4e91455afa92f 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/Makefile
+++ b/arch/powerpc/platforms/cell/spufs/Makefile
@@ -1,8 +1,10 @@
-obj-y += switch.o fault.o lscsa_alloc.o
 
 obj-$(CONFIG_SPU_FS) += spufs.o
 spufs-y += inode.o file.o context.o syscalls.o coredump.o
 spufs-y += sched.o backing_ops.o hw_ops.o run.o gang.o
+spufs-y += switch.o fault.o lscsa_alloc.o
+
+obj-$(CONFIG_SPU_TRACE)        += sputrace.o
 
 # Rules to build switch.o with the help of SPU tool chain
 SPU_CROSS      := spu-