Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

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);