diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:10:39 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 14:15:20 +0100 |
| commit | f67aa2ffb7ce2f6d88e2e7a8069309dc2627932e (patch) | |
| tree | a6ad87953f1207cc813e5ca31b4d525ce3cc7f0c /arch/x86/um/Makefile | |
| parent | fbe9868693d9025753427d7d28b9eed4d01cf674 (diff) | |
| download | blackbird-obmc-linux-f67aa2ffb7ce2f6d88e2e7a8069309dc2627932e.tar.gz blackbird-obmc-linux-f67aa2ffb7ce2f6d88e2e7a8069309dc2627932e.zip | |
um: merge signal_{32,64}.c
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/x86/um/Makefile')
| -rw-r--r-- | arch/x86/um/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index df419896693f..ffe1008a3f43 100644 --- a/arch/x86/um/Makefile +++ b/arch/x86/um/Makefile @@ -9,7 +9,7 @@ else endif obj-y = bug.o bugs_$(BITS).o delay_$(BITS).o fault.o ksyms.o ldt.o \ - ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal_$(BITS).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 \ mem_$(BITS).o subarch.o os-$(OS)/ |
