summaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/Makefile
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-02-13 06:56:24 +0100
committerKumar Gala <galak@kernel.crashing.org>2007-02-13 06:56:24 +0100
commitcbe56159a3e60624b5f44cf48b640fa470436e34 (patch)
treef3dd43243be6e840dc2b0386e91c4146a4f51620 /arch/um/kernel/Makefile
parentMerge branch 'master' into 83xx (diff)
parent[POWERPC] spufs: Fix bitrot of the SPU mmap facility (diff)
downloadlinux-cbe56159a3e60624b5f44cf48b640fa470436e34.tar.xz
linux-cbe56159a3e60624b5f44cf48b640fa470436e34.zip
Merge branch 'master' into 83xx
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 6fa63a2a89e3..c5cf4a0827b0 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.o exitcode.o init_task.o irq.o ksyms.o mem.o \
- physmem.o process.o ptrace.o reboot.o resource.o sigio.o \
+ physmem.o process.o ptrace.o reboot.o sigio.o \
signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o uaccess.o \
um_arch.o umid.o