commit 4198426af37e7122f2fda2538fa9dcaa19c5e397
author Al Viro <viro@zeniv.linux.org.uk> Sat Aug 23 17:00:34 2008 -0400
committer H. Peter Anvin <hpa@zytor.com> Wed Oct 22 22:55:22 2008 -0700
tree 398a9f0b31f3ad4c3a5dae5e39a5b238f3ecf224
parent f5ad6a42b700d9687bb97cf461e7f2506e3006d6

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>

arch/um/Makefile

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 2e042b0..bc070ce 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -96,9 +96,9 @@
 endef
 
 ifneq ($(KBUILD_SRC),)
-$(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch)
+$(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(HEADER_ARCH) $(ARCH_DIR)/Kconfig.arch)
 else
-$(shell ln -fsn Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch)
+$(shell ln -fsn Kconfig.$(HEADER_ARCH) $(ARCH_DIR)/Kconfig.arch)
 endif
 
 archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/shared/user_constants.h