summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-05-14 08:30:05 -0400
committerTom Rini <trini@konsulko.com>2020-07-01 10:11:03 -0400
commit6ca300aec0652661f2dd28c9976f9ecb6a338b77 (patch)
tree467570d23c379ccdae39c153f8aca2461859ed93 /arch/arm
parent897860ebc1a86506055f6225efff7888fe27d6ee (diff)
downloadu-boot-6ca300aec0652661f2dd28c9976f9ecb6a338b77.tar.gz
u-boot-6ca300aec0652661f2dd28c9976f9ecb6a338b77.tar.xz
u-boot-6ca300aec0652661f2dd28c9976f9ecb6a338b77.zip
socfpga: Mark socfpga_fpga_add() as static inline in the non-FPGA case
Unless we mark the function as 'static inline' it may end up being non-inlined by the compiled and result in duplicate functions. Cc: Marek Vasut <marex@denx.de> Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Cc: Ley Foon Tan <ley.foon.tan@intel.com> Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-socfpga/include/mach/misc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h
index f6de1ccb4a..a85c5aeef9 100644
--- a/arch/arm/mach-socfpga/include/mach/misc.h
+++ b/arch/arm/mach-socfpga/include/mach/misc.h
@@ -20,7 +20,7 @@ extern struct bsel bsel_str[];
#ifdef CONFIG_FPGA
void socfpga_fpga_add(void *fpga_desc);
#else
-inline void socfpga_fpga_add(void *fpga_desc) {}
+static inline void socfpga_fpga_add(void *fpga_desc) {}
#endif
#ifdef CONFIG_TARGET_SOCFPGA_GEN5