Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

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

diff --git a/arch/powerpc/platforms/pasemi/Makefile b/arch/powerpc/platforms/pasemi/Makefile
index 1be1a99..f47fcac 100644 (file)
--- a/arch/powerpc/platforms/pasemi/Makefile
+++ b/arch/powerpc/platforms/pasemi/Makefile
@@ -1 +1,4 @@
-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_ELECTRA_IDE) += electra_ide.o
+obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o