aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Pisa <pisa@cmp.felk.cvut.cz>2023-09-04 12:00:02 +0200
committerRob Herring <robh@kernel.org>2023-09-05 13:02:13 -0500
commitcf60ce92358da29f3b1e24005f7b748584b82753 (patch)
treeed2a70d42b11f46802b6f2afff6ae60ac34c0e5a
parent75cc186739805a5e8abe133be04692b36e7a5257 (diff)
downloadlinux-cf60ce92358da29f3b1e24005f7b748584b82753.tar.gz
of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY
The of_overlay_fdt_apply has been changed but when CONFIG_OF_OVERLAY support is not configured then old stub prototype is declared by of.h header. Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz> Fixes: 47284862bfc7 ("of: overlay: Extend of_overlay_fdt_apply() to specify the target node") Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Link: https://lore.kernel.org/r/20230904100002.7913-1-pisa@cmp.felk.cvut.cz Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r--include/linux/of.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index ed679819c2797..6a9ddf20e79ab 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1676,8 +1676,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);
#else
-static inline int of_overlay_fdt_apply(void *overlay_fdt, u32 overlay_fdt_size,
- int *ovcs_id)
+static inline int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
+ int *ovcs_id, struct device_node *target_base)
{
return -ENOTSUPP;
}