Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6] / arch / powerpc / xmon / Makefile

diff --git a/arch/powerpc/xmon/Makefile b/arch/powerpc/xmon/Makefile
index 4f274056e7706d900c00cf20795ad0544940f791..51d97588e762e6fc9a55cae2d07c6598751343ba 100644 (file)
--- a/arch/powerpc/xmon/Makefile
+++ b/arch/powerpc/xmon/Makefile
@@ -3,6 +3,10 @@
 ifdef CONFIG_PPC64
 EXTRA_CFLAGS += -mno-minimal-toc
 endif
-obj-y                  += xmon.o ppc-dis.o ppc-opc.o setjmp.o start.o \
-                          nonstdio.o
-obj-$(CONFIG_PPC_CELL) += spu-dis.o spu-opc.o
+
+obj-y                  += xmon.o setjmp.o start.o nonstdio.o
+
+ifdef CONFIG_XMON_DISASSEMBLY
+obj-y                  += ppc-dis.o ppc-opc.o
+obj-$(CONFIG_SPU_BASE) += spu-dis.o spu-opc.o
+endif