Merge branch 'karo-devel' into uboot-merge

diff --git a/board/karo/common/splashimage.c b/board/karo/common/splashimage.c
index bd1b64c8aafd0d7d08a88409ba4da4bfa7ed9fb9..35e6ac14875ce9da5c72763c21568cfcc49a2054 100644 (file)
--- a/board/karo/common/splashimage.c
+++ b/board/karo/common/splashimage.c
@@ -96,7 +96,7 @@ int karo_load_splashimage(int mode)
                return 0;
        }
 
-       if (tstc())
+       if (had_ctrlc())
                return -ENODEV;
 
        ret = karo_load_part(splashimage, (void *)la, fbsize);