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 /arch/alpha | |
| 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 '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 ec53c28e33de..3af21c789339 100644 --- a/arch/alpha/boot/bootp.c +++ b/arch/alpha/boot/bootp.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/string.h> | 11 | #include <linux/string.h> |
| 12 | #include <linux/version.h> | 12 | #include <linux/utsrelease.h> |
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | 14 | ||
| 15 | #include <asm/system.h> | 15 | #include <asm/system.h> |
diff --git a/arch/alpha/boot/bootpz.c b/arch/alpha/boot/bootpz.c index a6657f2cf9bd..4307bde80a35 100644 --- a/arch/alpha/boot/bootpz.c +++ b/arch/alpha/boot/bootpz.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 14 | #include <linux/version.h> | 14 | #include <linux/utsrelease.h> |
| 15 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 16 | 16 | ||
| 17 | #include <asm/system.h> | 17 | #include <asm/system.h> |
diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c index 78c9b0b6eea7..90ed55b662a8 100644 --- a/arch/alpha/boot/main.c +++ b/arch/alpha/boot/main.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 9 | #include <linux/string.h> | 9 | #include <linux/string.h> |
| 10 | #include <linux/version.h> | 10 | #include <linux/utsrelease.h> |
| 11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 12 | 12 | ||
| 13 | #include <asm/system.h> | 13 | #include <asm/system.h> |