summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@atlas.denx.de>2007-05-15 22:12:06 +0200
committerWolfgang Denk <wd@atlas.denx.de>2007-05-15 22:12:06 +0200
commit6844535a7175c8e0a792bcddf213fa76a934f1be (patch)
tree442ac5600c6983048d13d486dbc1933bf5aba62b
parente73865897fe9e2b111d7f9ef32fe428438771b11 (diff)
parent426a44277f094fe160e4160c1faab180c4047833 (diff)
downloadu-boot-imx-6844535a7175c8e0a792bcddf213fa76a934f1be.zip
u-boot-imx-6844535a7175c8e0a792bcddf213fa76a934f1be.tar.gz
u-boot-imx-6844535a7175c8e0a792bcddf213fa76a934f1be.tar.bz2
Merge with git://www.denx.de/git/u-boot-testing
-rw-r--r--common/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/common/main.c b/common/main.c
index d8c0054..f41d95c 100644
--- a/common/main.c
+++ b/common/main.c
@@ -113,7 +113,7 @@ static __inline__ int abortboot(int bootdelay)
u_int i;
# ifdef CONFIG_AUTOBOOT_PROMPT
- printf (CONFIG_AUTOBOOT_PROMPT, bootdelay);
+ printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
# endif
# ifdef CONFIG_AUTOBOOT_DELAY_STR
@@ -187,7 +187,7 @@ static __inline__ int abortboot(int bootdelay)
}
# if DEBUG_BOOTKEYS
if (!abort)
- puts ("key timeout\n");
+ puts("key timeout\n");
# endif
#ifdef CONFIG_SILENT_CONSOLE
@@ -244,13 +244,13 @@ static __inline__ int abortboot(int bootdelay)
# endif
break;
}
- udelay (10000);
+ udelay(10000);
}
- printf ("\b\b\b%2d ", bootdelay);
+ printf("\b\b\b%2d ", bootdelay);
}
- putc ('\n');
+ putc('\n');
#ifdef CONFIG_SILENT_CONSOLE
if (abort)