From b85725c9589c264ba8a8ab43bafedfd79f0210b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Wed, 15 Apr 2015 11:58:10 +0200
Subject: [PATCH] Fix merge issue

---
 programs/pkey/mpi_demo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/pkey/mpi_demo.c b/programs/pkey/mpi_demo.c
index 50a6cfdb2..a46144694 100644
--- a/programs/pkey/mpi_demo.c
+++ b/programs/pkey/mpi_demo.c
@@ -96,7 +96,7 @@ cleanup:
 
     if( ret != 0 )
     {
-        polarssl_printf( "\nAn error occurred.\n" );
+        mbedtls_printf( "\nAn error occurred.\n" );
         ret = 1;
     }