Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/arch/powerpc/platforms/pasemi/Makefile b/arch/powerpc/platforms/pasemi/Makefile
index 1be1a99..2cd2a4f 100644 (file)
--- a/arch/powerpc/platforms/pasemi/Makefile
+++ b/arch/powerpc/platforms/pasemi/Makefile
@@ -1 +1,3 @@
-obj-y  += setup.o pci.o time.o
+obj-y  += setup.o pci.o time.o idle.o powersave.o iommu.o
+obj-$(CONFIG_PPC_PASEMI_MDIO)  += gpio_mdio.o
+obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o