um: merge delay_{32,64}.c

Signed-off-by: Richard Weinberger <[email protected]>
oleg-nesterov · Nov 2, 2011 · d0af6cb · d0af6cb
1 parent 73395a0
commit d0af6cb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 61 deletions.
diff --git 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 \

diff --git a/arch/x86/um/delay_32.c → arch/x86/um/delay.c b/arch/x86/um/delay_32.c → arch/x86/um/delay.c
diff --git a/arch/x86/um/delay_64.c b/arch/x86/um/delay_64.c