aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/Makefile
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-03-27 01:14:31 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 08:44:37 -0800
commit9b4f018d92dbeff9305b4cf4aa80874c3974cfcc (patch)
treef344bda24c71134e1fd22189fc03eb9b19ccecc5 /arch/um/kernel/Makefile
parent63ae2a94d98dd9d94163918539ec80df33f44a69 (diff)
downloadkernel_goldelico_gta04-9b4f018d92dbeff9305b4cf4aa80874c3974cfcc.zip
kernel_goldelico_gta04-9b4f018d92dbeff9305b4cf4aa80874c3974cfcc.tar.gz
kernel_goldelico_gta04-9b4f018d92dbeff9305b4cf4aa80874c3974cfcc.tar.bz2
[PATCH] uml: merge irq_user.c and irq.c
The serial UML OS-abstraction layer patch (um/kernel dir). This joins irq_user.c and irq.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 693018b..8458c30 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y := vmlinux.lds
clean-files :=
obj-y = config.o exec_kern.o exitcode.o \
- init_task.o irq.o irq_user.o ksyms.o mem.o physmem.o \
+ init_task.o irq.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_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o