aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro2008-08-25 03:51:27 -0500
committerH. Peter Anvin2008-10-23 00:55:23 -0500
commit61bee20445935ee9802d25c261849440497497d3 (patch)
tree481d98b301e248fcd5647c859ecfe9c137d57b0f /Makefile
parentec82c32d45644998a28abad0a6a9ccdd721a054e (diff)
downloadlinux-phy-61bee20445935ee9802d25c261849440497497d3.tar.gz
linux-phy-61bee20445935ee9802d25c261849440497497d3.tar.xz
linux-phy-61bee20445935ee9802d25c261849440497497d3.zip
x86, um: get rid of arch/um/Kconfig.arch
Teach scripts/kconfig/Makefile and top-level Makefile that arch/*/Makefile is allowed to say Kconfig := <whatever I want instead of arch/blah/Kconfig>. Rewrite arch/um/Kconfig and arch/um/Kconfig.<subarch> so that the latter would be top-level one (and include the pieces of the former). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 16e3fbb968a8..f6703f1cd9c7 100644
--- a/Makefile
+++ b/Makefile
@@ -437,7 +437,7 @@ ifeq ($(config-targets),1)
437# KBUILD_DEFCONFIG may point out an alternative default configuration 437# KBUILD_DEFCONFIG may point out an alternative default configuration
438# used for 'make defconfig' 438# used for 'make defconfig'
439include $(srctree)/arch/$(SRCARCH)/Makefile 439include $(srctree)/arch/$(SRCARCH)/Makefile
440export KBUILD_DEFCONFIG 440export KBUILD_DEFCONFIG KBUILD_KCONFIG
441 441
442config %config: scripts_basic outputmakefile FORCE 442config %config: scripts_basic outputmakefile FORCE
443 $(Q)mkdir -p include/linux include/config 443 $(Q)mkdir -p include/linux include/config