diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-24 22:54:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-24 22:54:49 +0100 |
| commit | bcddae4453f74e9d1dbc8db78c5c9bc552c600cb (patch) | |
| tree | 44f433cdce0aea74d1098967ff28454e512f777f /arch/arc | |
| parent | bf3738e51576cd0cd8c59ef611734cc423323563 (diff) | |
| parent | fc40eed01c76797b6f71c982a782cef2d6ab48a6 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into linux-linaro-lsk
Conflicts:
drivers/of/fdt.c
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/kernel/devtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c index bdee3a812052..afdd13cf881c 100644 --- a/arch/arc/kernel/devtree.c +++ b/arch/arc/kernel/devtree.c @@ -40,7 +40,7 @@ struct machine_desc * __init setup_machine_fdt(void *dt) const char *model, *compat; void *clk; char manufacturer[16]; - unsigned long len; + int len; /* check device tree validity */ if (be32_to_cpu(devtree->magic) != OF_DT_HEADER) |