[PATCH 3/5] move utsrelease.h to include/generated/ instead of include/linux

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 .gitignore                  |    1 -
 Makefile                    |    6 +++---
 common/command.c            |    2 +-
 scripts/setupmbr/setupmbr.c |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2179251..2c580c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,6 @@ include/asm
 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 @@ endif
 # 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 @@ endef
 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 @@ CLEAN_FILES +=	barebox System.map include/barebox_default_env.h \
 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 <linux/list.h>
 #include <init.h>
 #include <complete.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <getopt.h>
 
 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 <assert.h>
 
 /* 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 */
-- 
1.7.1