diff --git a/.gitignore b/.gitignore index 2179251..2c580c6 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,6 @@ include/asm-*/asm-offsets.h include/config include/linux/compile.h -include/linux/utsrelease.h include/generated # stgit generated dirs diff --git a/Makefile b/Makefile index 838d6ed..c990005 100644 --- a/Makefile +++ b/Makefile @@ -796,7 +796,7 @@ # prepare2 creates a makefile if using a separate output directory prepare2: prepare3 outputmakefile -prepare1: prepare2 include/generated/version.h include/linux/utsrelease.h \ +prepare1: prepare2 include/generated/version.h include/generated/utsrelease.h \ include/asm include/config.h include/config/auto.conf ifneq ($(KBUILD_MODULES),) @@ -882,7 +882,7 @@ include/generated/version.h: $(srctree)/Makefile FORCE $(call filechk,version.h) -include/linux/utsrelease.h: include/config/kernel.release FORCE +include/generated/utsrelease.h: include/config/kernel.release FORCE $(call filechk,utsrelease.h) # --------------------------------------------------------------------------- @@ -979,7 +979,7 @@ MRPROPER_DIRS += include/config include2 usr/include MRPROPER_FILES += .config .config.old include/asm .version .old_version \ include/generated/autoconf.h include/generated/version.h \ - include/linux/utsrelease.h include/config.h \ + include/generated/utsrelease.h include/config.h \ Module.symvers tags TAGS cscope* # clean - Delete most, but leave enough to build external modules diff --git a/common/command.c b/common/command.c index 8ed1072..f1aeeb9 100644 --- a/common/command.c +++ b/common/command.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include const char version_string[] = diff --git a/scripts/setupmbr/setupmbr.c b/scripts/setupmbr/setupmbr.c index 01e8c64..3cfec97 100644 --- a/scripts/setupmbr/setupmbr.c +++ b/scripts/setupmbr/setupmbr.c @@ -42,7 +42,7 @@ #include /* include the info from this barebox release */ -#include "include/linux/utsrelease.h" +#include "include/generated/utsrelease.h" #include "arch/x86/include/asm/barebox.lds.h" /** define to disable integrity tests and debug messages */