diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:26:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:26:12 -0400 |
| commit | 51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9 (patch) | |
| tree | 4bd5332323a26b020dfeac6eb2e77fba790aed2e /init | |
| parent | d8cb7c1ded6e5a80a7335716dde60784a0d51c1d (diff) | |
| parent | 63104eec234bdecb55fd9c15467ae00d0a3f42ac (diff) | |
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 @@ | |||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/uts.h> | 11 | #include <linux/uts.h> |
| 12 | #include <linux/utsname.h> | 12 | #include <linux/utsname.h> |
| 13 | #include <linux/utsrelease.h> | ||
| 13 | #include <linux/version.h> | 14 | #include <linux/version.h> |
| 14 | 15 | ||
| 15 | #define version(a) Version_ ## a | 16 | #define version(a) Version_ ## a |