diff options
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 be0fad44ddd8..b0e4be28204d 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -108,7 +108,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(S | |||
108 | 108 | ||
109 | define mergeconfig | 109 | define mergeconfig |
110 | $(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture)) | 110 | $(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture)) |
111 | $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(call configfiles,$(1)) | 111 | $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(call configfiles,$(1)) |
112 | +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig | 112 | +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig |
113 | endef | 113 | endef |
114 | 114 | ||