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

torvalds · torvalds · commit 1e6d88ccf41c · 2016-03-30T20:40:42.000-05:00
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
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;
 }

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,7 @@ static int __init early_init_dt_scan_serial(unsigned long node,`
`97`	`97`	`return 0;`
`98`	`98`	`#endif`
`99`	`99`
`100`		`- addr64 = fdt_translate_address((const void )initial_boot_params,`
`101`		`- node);`
	`100`	`+ *addr64 = of_flat_dt_translate_address(node);`
`102`	`101`
`103`	`102`	`return *addr64 == OF_BAD_ADDR ? 0 : 1;`
`104`	`103`	`}`