Merge ../to-linus-stable/

[sfrench/cifs-2.6.git] / arch / ppc64 / boot / prom.c

diff --git a/arch/ppc64/boot/prom.c b/arch/ppc64/boot/prom.c
index d5218b15824e93444a5b2c8810ffff5e0e6416d4..5e48b80ff5a07471bd2f07feba550bd85cf9bbaf 100644 (file)
--- a/arch/ppc64/boot/prom.c
+++ b/arch/ppc64/boot/prom.c
@@ -40,7 +40,7 @@ void *finddevice(const char *name);
 int getprop(void *phandle, const char *name, void *buf, int buflen);
 void chrpboot(int a1, int a2, void *prom);     /* in main.c */
 
-void printk(char *fmt, ...);
+int printf(char *fmt, ...);
 
 /* there is no convenient header to get this from...  -- paulus */
 extern unsigned long strlen(const char *);
@@ -220,7 +220,7 @@ readchar(void)
                case 1:
                        return ch;
                case -1:
-                       printk("read(stdin) returned -1\r\n");
+                       printf("read(stdin) returned -1\r\n");
                        return -1;
                }
        }
@@ -627,18 +627,6 @@ int sprintf(char * buf, const char *fmt, ...)
 
 static char sprint_buf[1024];
 
-void
-printk(char *fmt, ...)
-{
-       va_list args;
-       int n;
-
-       va_start(args, fmt);
-       n = vsprintf(sprint_buf, fmt, args);
-       va_end(args);
-       write(stdout, sprint_buf, n);
-}
-
 int
 printf(char *fmt, ...)
 {