aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/of.h
diff options
context:
space:
mode:
authorChris Packham <chris.packham@alliedtelesis.co.nz>2019-03-22 13:23:41 +1300
committerRob Herring <robh@kernel.org>2019-04-10 16:33:34 -0500
commitecb0abc1d8528015957fbd034be8bfe760363b3b (patch)
tree283471f85ec30220fc809bd0b8a7076dc17fe6d8 /include/linux/of.h
parentof: reserved_mem: fix reserve memory leak (diff)
downloadlinux-dev-ecb0abc1d8528015957fbd034be8bfe760363b3b.tar.xz
linux-dev-ecb0abc1d8528015957fbd034be8bfe760363b3b.zip
of: use correct function prototype for of_overlay_fdt_apply()
When CONFIG_OF_OVERLAY is not enabled the fallback stub for of_overlay_fdt_apply() does not match the prototype for the case when CONFIG_OF_OVERLAY is enabled. Update the stub to use the correct function prototype. Fixes: 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT") Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Reviewed-by: Frank Rowand <frank.rowand@sony.com> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'include/linux/of.h')
-rw-r--r--include/linux/of.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index e240992e5cb6..28797e1a9982 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1449,7 +1449,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);
#else
-static inline int of_overlay_fdt_apply(void *overlay_fdt, int *ovcs_id)
+static inline int of_overlay_fdt_apply(void *overlay_fdt, u32 overlay_fdt_size,
+ int *ovcs_id)
{
return -ENOTSUPP;
}