Merge branch 'rk_develop-3.10' into rk_develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / devtree.c

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 5859c8bc727c4254bc7e8fa254a4271d6b214242..a44e7d11ab0214397b549d6fe9ca98bad7bdf578 100644 (file)
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -212,7 +212,7 @@ struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
        }
        if (!mdesc_best) {
                const char *prop;
-               long size;
+               int size;
 
                early_print("\nError: unrecognized/unsupported "
                            "device tree compatible list:\n[ ");