summaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/Makefile
diff options
context:
space:
mode:
authorGennady Sharapov <Gennady.V.Sharapov@intel.com>2006-01-08 01:01:32 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:13:39 -0800
commitc66fdd5e324392584c6f11de65cfe24b0e2d9303 (patch)
treef05cb784406c0a0cb24d291e515dfcaa3e4b6464 /arch/um/kernel/Makefile
parentea2ba7dc3dd3f85034e6da6abacc813d723a2ad5 (diff)
downloadop-kernel-dev-c66fdd5e324392584c6f11de65cfe24b0e2d9303.zip
op-kernel-dev-c66fdd5e324392584c6f11de65cfe24b0e2d9303.tar.gz
[PATCH] uml: merge trap_user.c and trap_kern.c
The serial UML OS-abstraction layer patch (um/kernel dir). This joins trap_user.c and trap_kernel.c files. Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com> Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel/Makefile')
-rw-r--r--arch/um/kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index 9ce6c57..193cc2b7 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -10,7 +10,7 @@ obj-y = config.o exec_kern.o exitcode.o \
init_task.o irq.o irq_user.o ksyms.o mem.o physmem.o \
process_kern.o ptrace.o reboot.o resource.o sigio_user.o sigio_kern.o \
signal_kern.o smp.o syscall_kern.o sysrq.o time.o \
- time_kern.o tlb.o trap_kern.o trap_user.o uaccess.o um_arch.o umid.o \
+ time_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o \
user_util.o
obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
OpenPOWER on IntegriCloud