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

[deliverable/linux.git] / arch / powerpc / platforms / ps3 / Makefile

diff --git a/arch/powerpc/platforms/ps3/Makefile b/arch/powerpc/platforms/ps3/Makefile
index 3757cfabc8ce09743913561cba7041dd9bbc2b1a..ac1bdf844ecabaf26abcc3b8b2e42e5d31743619 100644 (file)
--- a/arch/powerpc/platforms/ps3/Makefile
+++ b/arch/powerpc/platforms/ps3/Makefile
@@ -1,4 +1,7 @@
-obj-y += setup.o mm.o smp.o time.o hvcall.o htab.o repository.o
+obj-y += setup.o mm.o time.o hvcall.o htab.o repository.o
 obj-y += interrupt.o exports.o os-area.o
+obj-y += system-bus.o
 
+obj-$(CONFIG_SMP) += smp.o
 obj-$(CONFIG_SPU_BASE) += spu.o
+obj-y += device-init.o