diff --git a/[refs] b/[refs] index 538aa249b679..cad6cd268102 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db1d18657c96cc675596077cb60ef50fbe1947f8 +refs/heads/master: 32197c7ffb06b1319850f8fdfa1a49d32a63b79b diff --git a/trunk/Makefile b/trunk/Makefile index 96b32e5bb973..aa608c2959f5 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -492,7 +492,6 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ; # if auto.conf.cmd is missing then we are probably in a cleaned tree so # we execute the config step to be sure to catch updated Kconfig files include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd - $(Q)mkdir -p include/generated $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig else # external modules needs include/generated/autoconf.h and include/config/auto.conf diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile index 80599e3a7994..999e8a7d5bf7 100644 --- a/trunk/scripts/kconfig/Makefile +++ b/trunk/scripts/kconfig/Makefile @@ -27,6 +27,7 @@ oldconfig: $(obj)/conf $< -o $(Kconfig) silentoldconfig: $(obj)/conf + $(Q)mkdir -p include/generated $< -s $(Kconfig) localmodconfig: $(obj)/streamline_config.pl $(obj)/conf