projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[linux-2.6-block.git]
/
arch
/
mips
/
pic32
/
pic32mzda
/
init.c
diff --git
a/arch/mips/pic32/pic32mzda/init.c
b/arch/mips/pic32/pic32mzda/init.c
index 77ecf32ef3dc7cc53a68460087f3539138eeed6c..51599710472bcb4abf89293827345cffb7953a7f 100644
(file)
--- a/
arch/mips/pic32/pic32mzda/init.c
+++ b/
arch/mips/pic32/pic32mzda/init.c
@@
-33,8
+33,8
@@
static ulong get_fdtaddr(void)
{
ulong ftaddr = 0;
- if (
(fw_arg0 == -2) && fw_arg1
&& !fw_arg2 && !fw_arg3)
- return (ulong)fw_
arg1
;
+ if (
fw_passed_dtb
&& !fw_arg2 && !fw_arg3)
+ return (ulong)fw_
passed_dtb
;
if (__dtb_start < __dtb_end)
ftaddr = (ulong)__dtb_start;