summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-04-01 23:49:03 -0500
committerRob Herring <robh@kernel.org>2014-04-30 00:59:15 -0500
commit9d0c4dfedd96ee54fc075b16d02f82499c8cc3a6 (patch)
treebb76a58e00f5aa436c51c1db9841e89ab102d004 /arch/arm/kernel
parentbba04d965d06abbbe10afd3687742389107e198e (diff)
downloadblackbird-op-linux-9d0c4dfedd96ee54fc075b16d02f82499c8cc3a6.tar.gz
blackbird-op-linux-9d0c4dfedd96ee54fc075b16d02f82499c8cc3a6.zip
of/fdt: update of_get_flat_dt_prop in prep for libfdt
Make of_get_flat_dt_prop arguments compatible with libfdt fdt_getprop call in preparation to convert FDT code to use libfdt. Make the return value const and the property length ptr type an int. Signed-off-by: Rob Herring <robh@kernel.org> Tested-by: Michal Simek <michal.simek@xilinx.com> Tested-by: Grant Likely <grant.likely@linaro.org> Tested-by: Stephen Chivers <schivers@csc.com>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/devtree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index dff9cc0e9bd6..38f4711b4995 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -247,7 +247,7 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
if (!mdesc) {
const char *prop;
- long size;
+ int size;
unsigned long dt_root;
early_print("\nError: unrecognized/unsupported "
OpenPOWER on IntegriCloud