aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/powermac/bootx_init.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-03 21:26:12 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-03 21:26:12 -0700
commit51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9 (patch)
tree4bd5332323a26b020dfeac6eb2e77fba790aed2e /arch/powerpc/platforms/powermac/bootx_init.c
parentd8cb7c1ded6e5a80a7335716dde60784a0d51c1d (diff)
parent63104eec234bdecb55fd9c15467ae00d0a3f42ac (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/powermac/bootx_init.c')
-rw-r--r--arch/powerpc/platforms/powermac/bootx_init.c2
1 files changed, 1 insertions, 1 deletions
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 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/version.h>
+#include <linux/utsrelease.h>
#include <asm/sections.h>
#include <asm/prom.h>
#include <asm/page.h>

Privacy Policy