From: Emil Medve Date: Tue, 12 May 2009 18:48:32 +0000 (-0500) Subject: Remove inline qualifier from show_boot_progress() X-Git-Tag: v2009.06-rc2~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5e2c08c3ac90808e9be64856916bfd6df984823c;p=oweals%2Fu-boot.git 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 --- diff --git a/common/main.c b/common/main.c index 905d40f0e0..026edd1db2 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 */