diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-09-16 16:22:47 +0800 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-09-17 10:56:24 +0800 |
commit | 93bd1526aa15328cd37c2624be22b801d6ca1d1c (patch) | |
tree | 14e6a4a1012fc6fccd81328d5bce88aff200d753 | |
parent | 657c1346944ef268e98c5d68e8252b2e56399c06 (diff) | |
download | barebox-93bd1526aa15328cd37c2624be22b801d6ca1d1c.tar.gz barebox-93bd1526aa15328cd37c2624be22b801d6ca1d1c.tar.xz |
move utsrelease.h to include/generated/ instead of include/linux
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | common/command.c | 2 | ||||
-rw-r--r-- | scripts/setupmbr/setupmbr.c | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 2179251e9d..2c580c6b1f 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 @@ -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 8ed107256d..f1aeeb9df0 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 01e8c645f0..3cfec97aa0 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 */ |