projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
kernel
/
devtree.c
diff --git
a/arch/arm/kernel/devtree.c
b/arch/arm/kernel/devtree.c
index
f751714
..
9770797
100644
(file)
--- a/
arch/arm/kernel/devtree.c
+++ b/
arch/arm/kernel/devtree.c
@@
-212,7
+212,7
@@
const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
if (!mdesc) {
const char *prop;
if (!mdesc) {
const char *prop;
-
long
size;
+
int
size;
unsigned long dt_root;
early_print("\nError: unrecognized/unsupported "
unsigned long dt_root;
early_print("\nError: unrecognized/unsupported "