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/i386 | |
| 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/i386')
| -rw-r--r-- | arch/i386/boot/setup.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S index 0a5a3be6d69c..d2b684cd620a 100644 --- a/arch/i386/boot/setup.S +++ b/arch/i386/boot/setup.S | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <asm/segment.h> | 49 | #include <asm/segment.h> |
| 50 | #include <linux/version.h> | 50 | #include <linux/utsrelease.h> |
| 51 | #include <linux/compile.h> | 51 | #include <linux/compile.h> |
| 52 | #include <asm/boot.h> | 52 | #include <asm/boot.h> |
| 53 | #include <asm/e820.h> | 53 | #include <asm/e820.h> |