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 /include | |
| 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 'include')
| -rw-r--r-- | include/linux/vermagic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h index dc7c621e4647..46919f9f5eb3 100644 --- a/include/linux/vermagic.h +++ b/include/linux/vermagic.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include <linux/version.h> | 1 | #include <linux/utsrelease.h> |
| 2 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 3 | 3 | ||
| 4 | /* Simply sanity version stamp for modules. */ | 4 | /* Simply sanity version stamp for modules. */ |