Merge branch 'merge'

1 files changed, 4 insertions, 6 deletions

diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index fe08971b64cf..a2d93065b2d0 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -6,16 +6,14 @@
 extra-y := vmlinux.lds
 clean-files :=
 
-obj-y = config.o exec_kern.o exitcode.o \
-        init_task.o irq.o ksyms.o mem.o physmem.o \
-        process_kern.o ptrace.o reboot.o resource.o sigio_kern.o \
-        signal_kern.o smp.o syscall_kern.o sysrq.o \
-        time_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o
+obj-y = config.o exec.o exitcode.o init_task.o irq.o ksyms.o mem.o \
+        physmem.o process_kern.o ptrace.o reboot.o resource.o sigio.o \
+        signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o uaccess.o \
+        um_arch.o umid.o
 
 obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
 obj-$(CONFIG_GPROF)     += gprof_syms.o
 obj-$(CONFIG_GCOV)      += gmon_syms.o
-obj-$(CONFIG_SYSCALL_DEBUG) += syscall.o
 
 obj-$(CONFIG_MODE_TT) += tt/
 obj-$(CONFIG_MODE_SKAS) += skas/