summaryrefslogtreecommitdiff
path: root/arch/um/sys-i386/Makefile
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@hera.kernel.org>2005-05-27 01:16:24 -0700
committerChristoph Hellwig <hch@melbourne.sgi.com>2005-05-27 01:16:24 -0700
commitb19312c4c8f3f84da57bba01d45549df1cf10dcd (patch)
tree1c34ce89be6b4e257bc03026d0268deb17727044 /arch/um/sys-i386/Makefile
parentd3870398fafd4911bd84573b78be4b6b762f32b0 (diff)
parent4ec5240ec367a592834385893200dd4fb369354c (diff)
downloadlwn-b19312c4c8f3f84da57bba01d45549df1cf10dcd.tar.gz
lwn-b19312c4c8f3f84da57bba01d45549df1cf10dcd.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/sys-i386/Makefile')
-rw-r--r--arch/um/sys-i386/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index fcd67c3414e4..4351e5605506 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -9,11 +9,11 @@ USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
SYMLINKS = bitops.c semaphore.c highmem.c module.c
+include arch/um/scripts/Makefile.rules
+
bitops.c-dir = lib
semaphore.c-dir = kernel
highmem.c-dir = mm
module.c-dir = kernel
subdir- := util
-
-include arch/um/scripts/Makefile.rules