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 /arch/x86_64 | |
| 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 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/boot/setup.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S index 7de8b8fd1685..a50b631f4d2b 100644 --- a/arch/x86_64/boot/setup.S +++ b/arch/x86_64/boot/setup.S @@ -46,7 +46,7 @@ */ #include <asm/segment.h> -#include <linux/version.h> +#include <linux/utsrelease.h> #include <linux/compile.h> #include <asm/boot.h> #include <asm/e820.h> |