Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[mirror_ubuntu-artful-kernel.git] / arch / powerpc / xmon / Makefile

diff --git a/arch/powerpc/xmon/Makefile b/arch/powerpc/xmon/Makefile
index b20312e5ed271784bbeb79495ca122541d68707a..51d97588e762e6fc9a55cae2d07c6598751343ba 100644 (file)
--- a/arch/powerpc/xmon/Makefile
+++ b/arch/powerpc/xmon/Makefile
@@ -4,8 +4,9 @@ ifdef CONFIG_PPC64
 EXTRA_CFLAGS += -mno-minimal-toc
 endif
 
-obj-$(CONFIG_8xx)      += start_8xx.o
-obj-$(CONFIG_6xx)      += start_32.o
-obj-$(CONFIG_4xx)      += start_32.o
-obj-$(CONFIG_PPC64)    += start_64.o
-obj-y                  += xmon.o ppc-dis.o ppc-opc.o setjmp.o nonstdio.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