git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
powerpc
/
xmon
/
Makefile
diff --git
a/arch/powerpc/xmon/Makefile
b/arch/powerpc/xmon/Makefile
index
109d874
..
51d9758
100644
(file)
--- a/
arch/powerpc/xmon/Makefile
+++ b/
arch/powerpc/xmon/Makefile
@@
-3,5
+3,10
@@
ifdef CONFIG_PPC64
EXTRA_CFLAGS += -mno-minimal-toc
endif
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-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