Merge branch 'ps3' into next

2011-12-16 11:09:15 +11:00
parent e6f08d37e6 987706acf8
commit efdad722ef
9 changed files with 156 additions and 149 deletions
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -186,8 +186,8 @@ notrace void arch_local_irq_restore(unsigned long en)
 	 * Any HV call will have this side effect.
 	 */
 	if (firmware_has_feature(FW_FEATURE_PS3_LV1)) {
-		u64 tmp;
-		lv1_get_version_info(&tmp);
+		u64 tmp, tmp2;
+		lv1_get_version_info(&tmp, &tmp2);
 	}

 	__hard_irq_enable();