Merge branch 'for-2.6.28' of git://git.marvell.com/mv643xx_eth into upstream-next

[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 2f393f8caaedaeda2ea217271067103a47785f0f..7fd830872c43bf458bd68de22ff9384c411bed19 100644 (file)
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -8,6 +8,9 @@ obj-$(CONFIG_CBE_THERM)                 += cbe_thermal.o
 obj-$(CONFIG_CBE_CPUFREQ_PMI)          += cbe_cpufreq_pmi.o
 obj-$(CONFIG_CBE_CPUFREQ)              += cbe-cpufreq.o
 cbe-cpufreq-y                          += cbe_cpufreq_pervasive.o cbe_cpufreq.o
+obj-$(CONFIG_CBE_CPUFREQ_SPU_GOVERNOR) += cpufreq_spudemand.o
+
+obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON) += cbe_powerbutton.o
 
 ifeq ($(CONFIG_SMP),y)
 obj-$(CONFIG_PPC_CELL_NATIVE)          += smp.o
@@ -33,11 +36,14 @@ obj-$(CONFIG_PCI_MSI)                       += axon_msi.o
 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_htab.o beat_hvCall.o \
-                                          beat_iommu.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