Merge branch 'linux-2.6'

[linux-2.6] / arch / powerpc / platforms / cell / Makefile

diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index be059718becd078e4ec14649b33fc2734ec6bd0a..c89964c6fb1fc6c66166af182c6a9735e2cb857b 100644 (file)
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -13,15 +13,16 @@ obj-$(CONFIG_PPC_CELL_NATIVE)               += smp.o
 endif
 
 # needed only when building loadable spufs.ko
-spufs-modular-$(CONFIG_SPU_FS)         += spu_syscalls.o
 spu-priv1-$(CONFIG_PPC_CELL_NATIVE)    += spu_priv1_mmio.o
 
 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_notify.o \
+                                          spu_syscalls.o spu_fault.o \
                                           $(spu-priv1-y) \
                                           $(spu-manage-y) \
                                           spufs/
+
+obj-$(CONFIG_PCI_MSI)                  += axon_msi.o