summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-03 21:26:12 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-03 21:26:12 -0700
commit51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9 (patch)
tree4bd5332323a26b020dfeac6eb2e77fba790aed2e /init
parentd8cb7c1ded6e5a80a7335716dde60784a0d51c1d (diff)
parent63104eec234bdecb55fd9c15467ae00d0a3f42ac (diff)
downloadlinux-stable-51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9.tar.gz
linux-stable-51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9.tar.bz2
linux-stable-51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: introduce utsrelease.h kbuild: explicit turn off gcc stack-protector
Diffstat (limited to 'init')
-rw-r--r--init/version.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/version.c b/init/version.c
index 3ddc3ceec2fe..e290802c6bd2 100644
--- a/init/version.c
+++ b/init/version.c
@@ -10,6 +10,7 @@
#include <linux/module.h>
#include <linux/uts.h>
#include <linux/utsname.h>
+#include <linux/utsrelease.h>
#include <linux/version.h>
#define version(a) Version_ ## a