diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-07-13 21:39:13 +0200 | 
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-07-13 21:39:13 +0200 | 
| commit | bc2962482b707e44e0b43d20bd4dcf2a40230abb (patch) | |
| tree | 751c5e07c5ff0aa7910da0fe33b0a0996bda518c /common/main.c | |
| parent | 093172f08d6afb3f34d8a2f26ee0ee874261cf27 (diff) | |
| parent | 239f05ee4dd4cfe0b50f251b533dcebe9e67c360 (diff) | |
| download | olio-uboot-2014.01-bc2962482b707e44e0b43d20bd4dcf2a40230abb.tar.xz olio-uboot-2014.01-bc2962482b707e44e0b43d20bd4dcf2a40230abb.zip  | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/common/main.c b/common/main.c index 553ac357d..a00ebc194 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) @@ -962,7 +962,7 @@ int readline (const char *const prompt)  			n = 0;  			continue; -		case 0x17:				/* ^W - erase word 	*/ +		case 0x17:				/* ^W - erase word	*/  			p=delete_char(console_buffer, p, &col, &n, plen);  			while ((n > 0) && (*p != ' ')) {  				p=delete_char(console_buffer, p, &col, &n, plen);  |