Skip to content

Commit cf60ce9

Browse files
ppisarobherring
authored andcommitted
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: 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>
1 parent 75cc186 commit cf60ce9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/linux/of.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,8 +1676,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);
16761676

16771677
#else
16781678

1679-
static inline int of_overlay_fdt_apply(void *overlay_fdt, u32 overlay_fdt_size,
1680-
int *ovcs_id)
1679+
static inline int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
1680+
int *ovcs_id, struct device_node *target_base)
16811681
{
16821682
return -ENOTSUPP;
16831683
}

0 commit comments

Comments
 (0)