aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/um/Makefile
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2011-08-18 21:55:11 +0200
committerRichard Weinberger <richard@nod.at>2011-11-02 14:15:37 +0100
commitd0af6cbfa2eb675643cc651114364752e972900b (patch)
treea8ecae20a0c8d709cc655c3c62ccc9b4f7a58e57 /arch/x86/um/Makefile
parentum: distribute exports to where exported stuff is defined (diff)
downloadlinux-dev-d0af6cbfa2eb675643cc651114364752e972900b.tar.xz
linux-dev-d0af6cbfa2eb675643cc651114364752e972900b.zip
um: merge delay_{32,64}.c
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/x86/um/Makefile')
-rw-r--r--arch/x86/um/Makefile2
1 files changed, 1 insertions, 1 deletions
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 \