Merge /spare/repo/linux-2.6/

[sfrench/cifs-2.6.git] / arch / um / sys-i386 / Makefile

diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 4351e5605506edc13a059fadcf48c6abd1f9a3c8..4ca2a229da4997adebe0bc5f0425727bdda0e790 100644 (file)
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -1,6 +1,6 @@
 obj-y = bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
-       ptrace_user.o semaphore.o signal.o sigcontext.o syscalls.o sysrq.o \
-       sys_call_table.o
+       ptrace_user.o semaphore.o signal.o sigcontext.o stub.o stub_segv.o \
+       syscalls.o sysrq.o sys_call_table.o
 
 obj-$(CONFIG_HIGHMEM) += highmem.o
 obj-$(CONFIG_MODULES) += module.o
@@ -16,4 +16,8 @@ semaphore.c-dir = kernel
 highmem.c-dir = mm
 module.c-dir = kernel
 
+$(obj)/stub_segv.o : _c_flags = $(call unprofile,$(CFLAGS))
+
 subdir- := util
+
+include arch/um/scripts/Makefile.unmap