of: use correct function prototype for of_overlay_fdt_apply()
authorChris Packham <chris.packham@alliedtelesis.co.nz>
Fri, 22 Mar 2019 00:23:41 +0000 (13:23 +1300)
committerRob Herring <robh@kernel.org>
Wed, 10 Apr 2019 21:33:34 +0000 (16:33 -0500)
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>
include/linux/of.h

index e240992e5cb62d0dccf0ec73879185e93cb419b4..28797e1a9982749c5a86c4f39bd0f8c5b2fd3234 100644 (file)
@@ -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;
 }