Merge tag 'nios2-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kern…

…el/git/lftan/nios2 Pull nios2 fix from Ley Foon Tan: "Replace fdt_translate_address with of_flat_dt_translate_address" Fixes a build failure. * tag 'nios2-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2: nios2: Replace fdt_translate_address with of_flat_dt_translate_address
jakajancar · Mar 31, 2016 · 1e6d88c · 1e6d88c
2 parents 62f444e + 8fe8892
commit 1e6d88c
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c
@@ -97,8 +97,7 @@ static int __init early_init_dt_scan_serial(unsigned long node,
 		return 0;
 #endif
 
-	*addr64 = fdt_translate_address((const void *)initial_boot_params,
-		node);
+	*addr64 = of_flat_dt_translate_address(node);
 
 	return *addr64 == OF_BAD_ADDR ? 0 : 1;
 }