Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[u-boot] / common / main.c

diff --git a/common/main.c b/common/main.c
index 905d40f0e0961ad6b3f2f5140979dfaf5fe163ba..026edd1db23a19de127fd4b29ec9e69e43f87c99 100644 (file)
--- 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 */