diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-25 04:51:27 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-23 01:55:23 -0400 |
| commit | 61bee20445935ee9802d25c261849440497497d3 (patch) | |
| tree | 481d98b301e248fcd5647c859ecfe9c137d57b0f /scripts | |
| parent | ec82c32d45644998a28abad0a6a9ccdd721a054e (diff) | |
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 'scripts')
| -rw-r--r-- | scripts/kconfig/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index fa1a7d565903..fa8c2dd9c983 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -4,7 +4,11 @@ | |||
| 4 | 4 | ||
| 5 | PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config | 5 | PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config |
| 6 | 6 | ||
| 7 | ifdef KBUILD_KCONFIG | ||
| 8 | Kconfig := $(KBUILD_KCONFIG) | ||
| 9 | else | ||
| 7 | Kconfig := arch/$(SRCARCH)/Kconfig | 10 | Kconfig := arch/$(SRCARCH)/Kconfig |
| 11 | endif | ||
| 8 | 12 | ||
| 9 | xconfig: $(obj)/qconf | 13 | xconfig: $(obj)/qconf |
| 10 | $< $(Kconfig) | 14 | $< $(Kconfig) |