diff options
Diffstat (limited to 'scripts')
| -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 9645c0739386..fc34f46cb025 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -110,7 +110,7 @@ define mergeconfig | |||
| 110 | $(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target)) | 110 | $(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target)) |
| 111 | $(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture)) | 111 | $(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture)) |
| 112 | $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(call configfiles,$(1)) | 112 | $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(call configfiles,$(1)) |
| 113 | $(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig | 113 | +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig |
| 114 | endef | 114 | endef |
| 115 | 115 | ||
| 116 | PHONY += kvmconfig | 116 | PHONY += kvmconfig |