[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190322002342.24831-1-chris.packham@alliedtelesis.co.nz>
Date: Fri, 22 Mar 2019 13:23:41 +1300
From: Chris Packham <chris.packham@...iedtelesis.co.nz>
To: robh+dt@...nel.org, frowand.list@...il.com
Cc: Hamish Martin <hamish.martin@...iedtelesis.co.nz>,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Chris Packham <chris.packham@...iedtelesis.co.nz>
Subject: [PATCH] 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: commit 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT")
Signed-off-by: Chris Packham <chris.packham@...iedtelesis.co.nz>
---
include/linux/of.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/of.h b/include/linux/of.h
index e240992e5cb6..28797e1a9982 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -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;
}
--
2.21.0
Powered by blists - more mailing lists