Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecb0abc1 authored by Chris Packham's avatar Chris Packham Committed by Rob Herring
Browse files

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: 39a751a4 ("of: change overlay apply input data from unflattened to FDT")
Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: default avatarFrank Rowand <frank.rowand@sony.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent d0b8ed47

include/linux/of.h

+2 −1
Original line number Diff line number Diff line
@@ -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;

}