This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / m32r / boot / compressed / m32r_sio.c

diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c
index bdfd1c2..469c4dc 100644 (file)
--- a/arch/m32r/boot/compressed/m32r_sio.c
+++ b/arch/m32r/boot/compressed/m32r_sio.c
@@ -6,10 +6,12 @@
  */
 
 #include <linux/config.h>
+#include <asm/m32r.h>
+#include <asm/io.h>
 
-static void putc(char c);
+void putc(char c);
 
-static int puts(const char *s)
+int puts(const char *s)
 {
        char c;
        while ((c = *s++)) putc(c);
@@ -17,9 +19,6 @@ static int puts(const char *s)
 }
 
 #if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_M32700UT)
-#include <asm/m32r.h>
-#include <asm/io.h>
-
 #define USE_FPGA_MAP   0
 
 #if USE_FPGA_MAP
@@ -36,7 +35,7 @@ static int puts(const char *s)
 #define BOOT_SIO0TXB   PLD_ESIO0TXB
 #endif
 
-static void putc(char c)
+void putc(char c)
 {
 
        while ((*BOOT_SIO0STS & 0x3) != 0x3) ;
@@ -47,17 +46,8 @@ static void putc(char c)
        *BOOT_SIO0TXB = c;
 }
 #else
-#define SIO0STS        (volatile unsigned short *)(0xa0efd000 + 14)
-#define SIO0TXB        (volatile unsigned short *)(0xa0efd000 + 30)
-
-static void putc(char c)
+void putc(char c)
 {
-
-       while ((*SIO0STS & 0x1) == 0) ;
-       if (c == '\n') {
-               *SIO0TXB = '\r';
-               while ((*SIO0STS & 0x1) == 0) ;
-       }
-       *SIO0TXB = c;
+       /* do nothing */
 }
 #endif