summaryrefslogtreecommitdiff
path: root/arch/arm/mach-stm32mp/fdt.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-07-17 16:08:54 -0400
committerTom Rini <trini@konsulko.com>2020-07-17 16:08:54 -0400
commit1c4b5038afcc7cdb1064713f65571da05aa0de0e (patch)
treebbb554b1128dc15453a91fc50408446da2e0ddd2 /arch/arm/mach-stm32mp/fdt.c
parent7c3cc6f106ed1ca13b0ff6eea9f8e1473240aef3 (diff)
parent21fc5a16855602b2fd4b39e40679f854101a0fa3 (diff)
Merge branch '2020-07-17-misc-fixes'
A large number of assorted fixes, including but not limited to: - Correct fixdep and CONFIG_IS_ENABLED(...) - lz4 on big endian - Assorted LMB hardening - Remove bd_t typedef
Diffstat (limited to 'arch/arm/mach-stm32mp/fdt.c')
-rw-r--r--arch/arm/mach-stm32mp/fdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 959f12efe14..0de1d822912 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -248,7 +248,7 @@ static void stm32_fdt_disable_optee(void *blob)
* This function is called right before the kernel is booted. "blob" is the
* device tree that will be passed to the kernel.
*/
-int ft_system_setup(void *blob, bd_t *bd)
+int ft_system_setup(void *blob, struct bd_info *bd)
{
int ret = 0;
int soc;