diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-09-28 01:24:53 +0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-09-28 01:24:53 +0400 |
| commit | 0455029bea7da2a2a92003238c9617a36d5d48fd (patch) | |
| tree | 5dd4935db441dd443f38846236a8b353c9a92da1 /scripts/kconfig/Makefile | |
| parent | 8c41e5e363db55d91aa3b1cdce4ab02ad9821de7 (diff) | |
| parent | 838a2e55e6a4e9e8a10451ed2ef0f7a08dabdb04 (diff) | |
| download | linux-0455029bea7da2a2a92003238c9617a36d5d48fd.tar.xz | |
Merge branch 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/linux-2.6 into kbuild/kconfig
* 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/linux-2.6:
kbuild: migrate all arch to the kconfig mainmenu upgrade
kconfig: expand file names
kconfig: use the file's name of sourced file
kconfig: constify file name
kconfig: don't emit warning upon rootmenu's prompt redefinition
kconfig: replace KERNELVERSION usage by the mainmenu's prompt
kconfig: delay gconf window initialization
kconfig: expand by default the rootmenu's prompt
kconfig: add a symbol string expansion helper
kconfig: regen parser
kconfig: implement the `mainmenu' directive
kconfig: allow PACKAGE to be defined on the compiler's command-line
kconfig: rephrase help texts/comments not to include the package name
kconfig: allow build-time definition of the internal config prefix
kconfig: rephrase help text not to mention the internal prefix
kconfig: replace a `switch()' statement by a more flexible `if()' statement
Diffstat (limited to 'scripts/kconfig/Makefile')
| -rw-r--r-- | scripts/kconfig/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 3fbfe98be2b5..368ae306aee4 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -8,7 +8,7 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-c ifdef KBUILD_KCONFIG Kconfig := $(KBUILD_KCONFIG) else -Kconfig := arch/$(SRCARCH)/Kconfig +Kconfig := Kconfig endif xconfig: $(obj)/qconf |