From d0af6cbfa2eb675643cc651114364752e972900b Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Thu, 18 Aug 2011 21:55:11 +0200 Subject: um: merge delay_{32,64}.c Signed-off-by: Richard Weinberger --- arch/x86/um/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/x86/um/Makefile') diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index ffe1008a3f43..8fb58400e415 100644 --- a/arch/x86/um/Makefile +++ b/arch/x86/um/Makefile @@ -8,7 +8,7 @@ else BITS := 64 endif -obj-y = bug.o bugs_$(BITS).o delay_$(BITS).o fault.o ksyms.o ldt.o \ +obj-y = bug.o bugs_$(BITS).o delay.o fault.o ksyms.o ldt.o \ ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \ stub_$(BITS).o stub_segv.o syscalls_$(BITS).o \ sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \ -- cgit v1.2.3