diff options
| author | Jeff Dike <jdike@addtoit.com> | 2005-09-16 19:27:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-17 11:50:00 -0700 |
| commit | 114069f7384c15a7a9f8d3e333caf4d470dfe520 (patch) | |
| tree | 0bb25d2df50954e14bcd509dd585ec44bfbcff81 /arch/um/kernel/Makefile | |
| parent | 0f80bc85c587e8fdeecece4f294a47eca4922ea2 (diff) | |
| download | kernel_samsung_aries-114069f7384c15a7a9f8d3e333caf4d470dfe520.zip kernel_samsung_aries-114069f7384c15a7a9f8d3e333caf4d470dfe520.tar.gz kernel_samsung_aries-114069f7384c15a7a9f8d3e333caf4d470dfe520.tar.bz2 | |
[PATCH] uml: merge mem_user.c and mem.c
The serial UML OS-abstraction layer patch (um/kernel dir).
This joins mem_user.c and mem.c files.
Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 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/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile index 7eb52c5..1a0001b 100644 --- a/arch/um/kernel/Makefile +++ b/arch/um/kernel/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2002 Jeff Dike (jdike@karaya.com) # Licensed under the GPL # @@ -7,11 +7,11 @@ extra-y := vmlinux.lds clean-files := obj-y = config.o exec_kern.o exitcode.o \ - helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o mem_user.o \ - physmem.o process_kern.o ptrace.o reboot.o resource.o sigio_user.o \ - sigio_kern.o signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o \ - time.o time_kern.o tlb.o trap_kern.o trap_user.o \ - uaccess_user.o um_arch.o umid.o user_util.o + helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o physmem.o \ + process_kern.o ptrace.o reboot.o resource.o sigio_user.o sigio_kern.o \ + signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o time.o \ + time_kern.o tlb.o trap_kern.o trap_user.o uaccess_user.o um_arch.o \ + umid.o user_util.o obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o obj-$(CONFIG_GPROF) += gprof_syms.o |