diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-29 15:48:34 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-29 15:48:34 -0500 |
| commit | be37bdbce7ceaacf4f20c6cc759efbe75ebd1196 (patch) | |
| tree | f1a42fb5a4a17eea41d47d2c002fa303009f5523 /arch/um/Makefile | |
| parent | 019a61b99338d0ac05de25317b85da88e7ec4b35 (diff) | |
| parent | d70aa5e4b54aa7e704c886838715ac8a45d5750f (diff) | |
Merge ../linus
Diffstat (limited to 'arch/um/Makefile')
| -rw-r--r-- | arch/um/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index e55d32e903bc..1b12feeba368 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
| @@ -17,7 +17,7 @@ core-y += $(ARCH_DIR)/kernel/ \ | |||
| 17 | 17 | ||
| 18 | # Have to precede the include because the included Makefiles reference them. | 18 | # Have to precede the include because the included Makefiles reference them. |
| 19 | SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \ | 19 | SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \ |
| 20 | module.h vm-flags.h elf.h | 20 | module.h vm-flags.h elf.h ldt.h |
| 21 | SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header)) | 21 | SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header)) |
| 22 | 22 | ||
| 23 | # XXX: The "os" symlink is only used by arch/um/include/os.h, which includes | 23 | # XXX: The "os" symlink is only used by arch/um/include/os.h, which includes |