From 5e2c08c3ac90808e9be64856916bfd6df984823c Mon Sep 17 00:00:00 2001 From: Emil Medve Date: Tue, 12 May 2009 13:48:32 -0500 Subject: Remove inline qualifier from show_boot_progress() The 'inline' is conflicting with the semantic of 'weak' attribute and with the way the show_boot_progress() function is used. Also gcc 4.4 is complaining about it: main.c:51: error: inline function 'show_boot_progress' cannot be declared weak Signed-off-by: Emil Medve --- common/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/main.c') diff --git a/common/main.c b/common/main.c index 905d40f..026edd1 100644 --- a/common/main.c +++ b/common/main.c @@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR; * Board-specific Platform code can reimplement show_boot_progress () if needed */ void inline __show_boot_progress (int val) {} -void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); +void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY) extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */ -- cgit v1.1