diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-23 17:00:34 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-23 01:55:22 -0400 |
| commit | 4198426af37e7122f2fda2538fa9dcaa19c5e397 (patch) | |
| tree | 398a9f0b31f3ad4c3a5dae5e39a5b238f3ecf224 /arch/um/Makefile | |
| parent | f5ad6a42b700d9687bb97cf461e7f2506e3006d6 (diff) | |
x86, um: merge Kconfig.i386 and Kconfig.x86_64
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um/Makefile')
| -rw-r--r-- | arch/um/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 2e042b0e3b8a..bc070cef3ceb 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
| @@ -96,9 +96,9 @@ define archhelp | |||
| 96 | endef | 96 | endef |
| 97 | 97 | ||
| 98 | ifneq ($(KBUILD_SRC),) | 98 | ifneq ($(KBUILD_SRC),) |
| 99 | $(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch) | 99 | $(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(HEADER_ARCH) $(ARCH_DIR)/Kconfig.arch) |
| 100 | else | 100 | else |
| 101 | $(shell ln -fsn Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch) | 101 | $(shell ln -fsn Kconfig.$(HEADER_ARCH) $(ARCH_DIR)/Kconfig.arch) |
| 102 | endif | 102 | endif |
| 103 | 103 | ||
| 104 | archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/shared/user_constants.h | 104 | archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/shared/user_constants.h |