drm: merge in Linus mainline

[sfrench/cifs-2.6.git] / arch / powerpc / xmon / Makefile

diff --git a/arch/powerpc/xmon/Makefile b/arch/powerpc/xmon/Makefile
index 79a784f0e7a94aee5f2e83c871c25f52d9b39ce6..b20312e5ed271784bbeb79495ca122541d68707a 100644 (file)
--- a/arch/powerpc/xmon/Makefile
+++ b/arch/powerpc/xmon/Makefile
@@ -8,4 +8,4 @@ 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 subr_prf.o setjmp.o
+obj-y                  += xmon.o ppc-dis.o ppc-opc.o setjmp.o nonstdio.o