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/powerpc/platforms/chrp/setup.c | |
| 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/powerpc/platforms/chrp/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/chrp/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
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> |