aboutsummaryrefslogtreecommitdiffstats
path: root/include
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 /include
parent[PATCH] revert "kthread: convert stop_machine into a kthread" (diff)
parentkbuild: introduce utsrelease.h (diff)
downloadlinux-dev-51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9.tar.xz
linux-dev-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 'include')
-rw-r--r--include/linux/vermagic.h2
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 @@
-#include <linux/version.h>
+#include <linux/utsrelease.h>
#include <linux/module.h>
/* Simply sanity version stamp for modules. */