diff options
Diffstat (limited to 'arch/m32r/boot/compressed')
| -rw-r--r-- | arch/m32r/boot/compressed/m32r_sio.c | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c index 01d877c6868f..cf3023dced49 100644 --- a/arch/m32r/boot/compressed/m32r_sio.c +++ b/arch/m32r/boot/compressed/m32r_sio.c @@ -8,12 +8,13 @@  #include <asm/processor.h> -static void putc(char c); +static void m32r_putc(char c);  static int puts(const char *s)  {  	char c; -	while ((c = *s++)) putc(c); +	while ((c = *s++)) +		m32r_putc(c);  	return 0;  } @@ -41,7 +42,7 @@ static int puts(const char *s)  #define BOOT_SIO0TXB	PLD_ESIO0TXB  #endif -static void putc(char c) +static void m32r_putc(char c)  {  	while ((*BOOT_SIO0STS & 0x3) != 0x3)  		cpu_relax(); @@ -61,7 +62,7 @@ static void putc(char c)  #define SIO0TXB	(volatile unsigned short *)(0x00efd000 + 30)  #endif -static void putc(char c) +static void m32r_putc(char c)  {  	while ((*SIO0STS & 0x1) == 0)  		cpu_relax();  |