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 | |
| 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')
| -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 | ||||
| -rw-r--r-- | arch/frv/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/i386/boot/setup.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/chrp/setup.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powermac/bootx_init.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/btext.c | 2 | ||||
| -rw-r--r-- | arch/x86_64/boot/setup.S | 2 |
9 files changed, 9 insertions, 9 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> |
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index 5db3d4eff909..af08ccd4ed6e 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/version.h> | 13 | #include <linux/utsrelease.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
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> |
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c index bb10171132fa..538e337d63e2 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <linux/reboot.h> | 24 | #include <linux/reboot.h> |
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
| 27 | #include <linux/version.h> | 27 | #include <linux/utsrelease.h> |
| 28 | #include <linux/adb.h> | 28 | #include <linux/adb.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c index e63d52f227ee..871b002c9f90 100644 --- a/arch/powerpc/platforms/powermac/bootx_init.c +++ b/arch/powerpc/platforms/powermac/bootx_init.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/version.h> | 15 | #include <linux/utsrelease.h> |
| 16 | #include <asm/sections.h> | 16 | #include <asm/sections.h> |
| 17 | #include <asm/prom.h> | 17 | #include <asm/prom.h> |
| 18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
diff --git a/arch/ppc/syslib/btext.c b/arch/ppc/syslib/btext.c index 51ab6e90fe25..d11667046f21 100644 --- a/arch/ppc/syslib/btext.c +++ b/arch/ppc/syslib/btext.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 7 | #include <linux/string.h> | 7 | #include <linux/string.h> |
| 8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 9 | #include <linux/version.h> | 9 | #include <linux/utsrelease.h> |
| 10 | 10 | ||
| 11 | #include <asm/sections.h> | 11 | #include <asm/sections.h> |
| 12 | #include <asm/bootx.h> | 12 | #include <asm/bootx.h> |
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 @@ | |||
| 46 | */ | 46 | */ |
| 47 | 47 | ||
| 48 | #include <asm/segment.h> | 48 | #include <asm/segment.h> |
| 49 | #include <linux/version.h> | 49 | #include <linux/utsrelease.h> |
| 50 | #include <linux/compile.h> | 50 | #include <linux/compile.h> |
| 51 | #include <asm/boot.h> | 51 | #include <asm/boot.h> |
| 52 | #include <asm/e820.h> | 52 | #include <asm/e820.h> |