1 files changed, 6 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 86b66cf85ced..3bdd932e3d88 100644
--- a/Makefile
+++ b/Makefile
@@ -336,7 +336,7 @@ CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \
                    $(if $(KBUILD_SRC), -I$(srctree)/include) \
-                   -include include/linux/autoconf.h
+                   -include include/generated/autoconf.h
 
 KBUILD_CPPFLAGS := -D__KERNEL__
 
@@ -492,17 +492,18 @@ $(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/linux/autoconf.h and include/config/auto.conf
+# external modules needs include/generated/autoconf.h and include/config/auto.conf
 # but do not care if they are up-to-date. Use auto.conf to trigger the test
 PHONY += include/config/auto.conf
 
 include/config/auto.conf:
-        $(Q)test -e include/linux/autoconf.h -a -e $@ || (              \
+        $(Q)test -e include/generated/autoconf.h -a -e $@ || (          \
         echo;                                                           \
         echo "  ERROR: Kernel configuration is invalid.";               \
-        echo "         include/linux/autoconf.h or $@ are missing.";    \
+        echo "         include/generated/autoconf.h or $@ are missing.";\
         echo "         Run 'make oldconfig && make prepare' on kernel src to fix it.";  \
         echo;                                                           \
         /bin/false)
@@ -1149,7 +1150,7 @@ CLEAN_FILES +=	vmlinux System.map \
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config usr/include include/generated
 MRPROPER_FILES += .config .config.old .version .old_version             \
-                  include/linux/autoconf.h include/linux/version.h      \
+                  include/linux/version.h                               \
                   include/linux/utsrelease.h                            \
                   Module.symvers Module.markers tags TAGS cscope*