Skip to content

Commit

Permalink
of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY
Browse files Browse the repository at this point in the history
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: 4728486 ("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>
  • Loading branch information
Pavel Pisa authored and Rob Herring committed Sep 5, 2023
1 parent 75cc186 commit cf60ce9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/linux/of.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit cf60ce9

Please sign in to comment.