diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-30 20:40:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-30 20:40:42 -0500 |
| commit | 1e6d88ccf41c7ef2d6c99aa5e7fb9215aa0e5423 (patch) | |
| tree | 62f5250921c403703c7050f44d33fd2dafce899e | |
| parent | 62f444e0548eb503b42c8447675b468f5cf40c69 (diff) | |
| parent | 8fe889274c7a4d95c3e2d06f87ead499ea6faa2d (diff) | |
| download | linux-1e6d88ccf41c7ef2d6c99aa5e7fb9215aa0e5423.tar.bz2 | |
Merge tag 'nios2-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/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
| -rw-r--r-- | arch/nios2/kernel/prom.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c index 718dd197909f..367c5426157b 100644 --- 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; } |