diff options
author | Stefano Babic <sbabic@denx.de> | 2014-08-08 10:18:40 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2014-08-08 10:18:40 +0200 |
commit | c23154aab5825fec81d5500c53eaa686646c76b5 (patch) | |
tree | 32b0aafae49f664a65ced50981492bb031f006b8 /common/main.c | |
parent | cb07d74e2e0c0a41533b6bcd551af9bf2ebcf2bc (diff) | |
parent | 9d195a546179bc732aba9eacccf0a9a3db591288 (diff) | |
download | u-boot-imx-c23154aab5825fec81d5500c53eaa686646c76b5.zip u-boot-imx-c23154aab5825fec81d5500c53eaa686646c76b5.tar.gz u-boot-imx-c23154aab5825fec81d5500c53eaa686646c76b5.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/main.c')
-rw-r--r-- | common/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/common/main.c b/common/main.c index 32618f1..2979fbe 100644 --- a/common/main.c +++ b/common/main.c @@ -17,8 +17,7 @@ DECLARE_GLOBAL_DATA_PTR; /* * Board-specific Platform code can reimplement show_boot_progress () if needed */ -void inline __show_boot_progress (int val) {} -void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); +__weak void show_boot_progress(int val) {} static void modem_init(void) { |