From 7ffb79b4f2e8cd0d65814a2e7f8c78e176422e77 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 8 Oct 2018 08:32:50 +0200 Subject: ARM: socfpga: Arria10: add missing static Avoid "multiple definition of `a10_wait_for_usermode'" Signed-off-by: Sascha Hauer --- arch/arm/mach-socfpga/include/mach/arria10-fpga.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-socfpga/include/mach') diff --git a/arch/arm/mach-socfpga/include/mach/arria10-fpga.h b/arch/arm/mach-socfpga/include/mach/arria10-fpga.h index 0d957dedcf..2e29c864f6 100644 --- a/arch/arm/mach-socfpga/include/mach/arria10-fpga.h +++ b/arch/arm/mach-socfpga/include/mach/arria10-fpga.h @@ -72,7 +72,7 @@ #define CFGWDTH_32 1 #define CFGWDTH_16 0 -int inline a10_wait_for_usermode(int timeout) { +static inline int a10_wait_for_usermode(int timeout) { while ((readl(ARRIA10_FPGAMGRREGS_ADDR + A10_FPGAMGR_IMGCFG_STAT_OFST) & (A10_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE | -- cgit v1.2.3