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

[people/ms/u-boot.git] / common / bootretry.c

diff --git a/common/bootretry.c b/common/bootretry.c
index 12653c00d0f259dcd06ae60d21812557f64e447e..2d82798cd04bc6ba004d2382ceaab79637c79a85 100644 (file)
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -21,7 +21,7 @@ static int      retry_time = -1; /* -1 so can call readline before main_loop */
 /***************************************************************************
  * initialize command line timeout
  */
-void init_cmd_timeout(void)
+void bootretry_init_cmd_timeout(void)
 {
        char *s = getenv("bootretry");
 
@@ -37,7 +37,7 @@ void init_cmd_timeout(void)
 /***************************************************************************
  * reset command line timeout to retry_time seconds
  */
-void reset_cmd_timeout(void)
+void bootretry_reset_cmd_timeout(void)
 {
        endtime = endtick(retry_time);
 }