commit 9a79b2274186fade17134929d4f85b70d59a3840
author Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Jul 19 18:38:13 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Jul 19 18:38:13 2007 -0700
tree d74e9ecc83ef617166445501b49087726595fb63
parent 75473c1d3930896bbabcc99bb58fafd53ef42473
parent 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac

Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  mm: Remove slab destructors from kmem_cache_create().

arch/um/Makefile

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 5d5ed72..989224f 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -146,7 +146,7 @@
 	-Wl,-T,$(vmlinux-lds) $(vmlinux-init) \
 	-Wl,--start-group $(vmlinux-main) -Wl,--end-group \
 	-lutil \
-	$(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) \
+	$(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o \
 	FORCE ,$^) ; rm -f linux
 endef