summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/ps3/setup.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-16 04:09:15 +0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-16 04:09:15 +0400
commitefdad722ef4d69eaaa8335deab0b6f55f52d7e57 (patch)
treeb50381ee7ec4c3616520124101db4a4b6bae669c /arch/powerpc/platforms/ps3/setup.c
parente6f08d37e6641b38b2da4ad40d6ca2cfb616a1dc (diff)
parent987706acf8e3a6e50445c5712e994b937cbdd83c (diff)
downloadlinux-efdad722ef4d69eaaa8335deab0b6f55f52d7e57.tar.xz
Merge branch 'ps3' into next
Diffstat (limited to 'arch/powerpc/platforms/ps3/setup.c')
-rw-r--r--arch/powerpc/platforms/ps3/setup.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index e8ec1b2bfffd..2d664c5a83b0 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -193,10 +193,12 @@ static int ps3_set_dabr(unsigned long dabr)
static void __init ps3_setup_arch(void)
{
+ u64 tmp;
DBG(" -> %s:%d\n", __func__, __LINE__);
- lv1_get_version_info(&ps3_firmware_version.raw);
+ lv1_get_version_info(&ps3_firmware_version.raw, &tmp);
+
printk(KERN_INFO "PS3 firmware version %u.%u.%u\n",
ps3_firmware_version.major, ps3_firmware_version.minor,
ps3_firmware_version.rev);