Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / arch / um / sys-i386 / Makefile

diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 94b6ede5ef6c5c0f97a254a3eddae5351b1a182f..598b5c1903af11f10c5c171402b6d283ba9e7565 100644 (file)
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -1,12 +1,16 @@
+#
+# Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+#
+
 obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
-       ptrace_user.o setjmp.o signal.o sigcontext.o stub.o stub_segv.o \
-       syscalls.o sysrq.o sys_call_table.o tls.o
+       ptrace_user.o setjmp.o signal.o stub.o stub_segv.o syscalls.o sysrq.o \
+       sys_call_table.o tls.o
 
-subarch-obj-y = lib/bitops_32.o lib/semaphore_32.o lib/string_32.o
+subarch-obj-y = lib/semaphore_32.o lib/string_32.o
 subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o
 subarch-obj-$(CONFIG_MODULES) += kernel/module_32.o
 
-USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
+USER_OBJS := bugs.o ptrace_user.o fault.o
 
 USER_OBJS += user-offsets.s
 extra-y += user-offsets.s