Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index f88a7c76f2964f08e8771f7670f58fd14f726496..c2a7e4e5ddf983e5dacfbe45af4925a16d2dc122 100644 (file)
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -1,6 +1,7 @@
 obj-$(CONFIG_PPC_CELL_NATIVE)          += interrupt.o iommu.o setup.o \
                                           cbe_regs.o spider-pic.o \
-                                          pervasive.o pmu.o io-workarounds.o
+                                          pervasive.o pmu.o io-workarounds.o \
+                                          spider-pci.o
 obj-$(CONFIG_CBE_RAS)                  += ras.o
 
 obj-$(CONFIG_CBE_THERM)                        += cbe_thermal.o
@@ -13,17 +14,33 @@ 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
+
+
+# celleb stuff
+ifeq ($(CONFIG_PPC_CELLEB),y)
+obj-y                                  += celleb_setup.o \
+                                          celleb_pci.o celleb_scc_epci.o \
+                                          celleb_scc_pciex.o \
+                                          celleb_scc_uhc.o \
+                                          io-workarounds.o spider-pci.o \
+                                          beat.o beat_htab.o beat_hvCall.o \
+                                          beat_interrupt.o beat_iommu.o
+
+obj-$(CONFIG_SMP)                      += beat_smp.o
+obj-$(CONFIG_PPC_UDBG_BEAT)            += beat_udbg.o
+obj-$(CONFIG_SERIAL_TXX9)              += celleb_scc_sio.o
+obj-$(CONFIG_SPU_BASE)                 += beat_spu_priv1.o
+endif