diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 06:26:12 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 06:26:12 +0200 |
commit | 51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9 (patch) | |
tree | 4bd5332323a26b020dfeac6eb2e77fba790aed2e /init | |
parent | [PATCH] revert "kthread: convert stop_machine into a kthread" (diff) | |
parent | kbuild: introduce utsrelease.h (diff) | |
download | linux-51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9.tar.xz linux-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.c | 1 |
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 |