diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 21:40:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 21:40:25 -0400 |
| commit | 462cee296476278acaa54c41925b3273e0e4dd40 (patch) | |
| tree | c9d9fcfc4dd62807cb67678a6eda0151bfa8be95 /arch/um/sys-i386/Makefile | |
| parent | 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'arch/um/sys-i386/Makefile')
| -rw-r--r-- | arch/um/sys-i386/Makefile | 4 |
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 | |||
| 9 | 9 | ||
| 10 | SYMLINKS = bitops.c semaphore.c highmem.c module.c | 10 | SYMLINKS = bitops.c semaphore.c highmem.c module.c |
| 11 | 11 | ||
| 12 | include arch/um/scripts/Makefile.rules | ||
| 13 | |||
| 12 | bitops.c-dir = lib | 14 | bitops.c-dir = lib |
| 13 | semaphore.c-dir = kernel | 15 | semaphore.c-dir = kernel |
| 14 | highmem.c-dir = mm | 16 | highmem.c-dir = mm |
| 15 | module.c-dir = kernel | 17 | module.c-dir = kernel |
| 16 | 18 | ||
| 17 | subdir- := util | 19 | subdir- := util |
| 18 | |||
| 19 | include arch/um/scripts/Makefile.rules | ||