diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 21:26:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 21:26:12 -0700 |
commit | 51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9 (patch) | |
tree | 4bd5332323a26b020dfeac6eb2e77fba790aed2e /arch/alpha | |
parent | d8cb7c1ded6e5a80a7335716dde60784a0d51c1d (diff) | |
parent | 63104eec234bdecb55fd9c15467ae00d0a3f42ac (diff) | |
download | kernel_samsung_crespo-51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9.zip kernel_samsung_crespo-51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9.tar.gz kernel_samsung_crespo-51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9.tar.bz2 |
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/alpha')
-rw-r--r-- | arch/alpha/boot/bootp.c | 2 | ||||
-rw-r--r-- | arch/alpha/boot/bootpz.c | 2 | ||||
-rw-r--r-- | arch/alpha/boot/main.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/boot/bootp.c b/arch/alpha/boot/bootp.c index ec53c28..3af21c7 100644 --- a/arch/alpha/boot/bootp.c +++ b/arch/alpha/boot/bootp.c @@ -9,7 +9,7 @@ */ #include <linux/kernel.h> #include <linux/string.h> -#include <linux/version.h> +#include <linux/utsrelease.h> #include <linux/mm.h> #include <asm/system.h> diff --git a/arch/alpha/boot/bootpz.c b/arch/alpha/boot/bootpz.c index a6657f2..4307bde 100644 --- a/arch/alpha/boot/bootpz.c +++ b/arch/alpha/boot/bootpz.c @@ -11,7 +11,7 @@ */ #include <linux/kernel.h> #include <linux/string.h> -#include <linux/version.h> +#include <linux/utsrelease.h> #include <linux/mm.h> #include <asm/system.h> diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c index 78c9b0b..90ed55b 100644 --- a/arch/alpha/boot/main.c +++ b/arch/alpha/boot/main.c @@ -7,7 +7,7 @@ */ #include <linux/kernel.h> #include <linux/string.h> -#include <linux/version.h> +#include <linux/utsrelease.h> #include <linux/mm.h> #include <asm/system.h> |