From 76c8aaad82b3a8e3425891939ad6b59114073d11 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olh@suse.de>
Date: Tue, 28 Jun 2005 21:01:35 +1000
Subject: [PATCH] --- yaml --- r: 4014 b: refs/heads/master c:
 e6019db5a7f110839c62cefc073b6dc1143d6403 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/arch/ppc64/boot/main.c |  1 -
 trunk/arch/ppc64/boot/prom.c | 16 ++--------------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 46071807c19e..3feec77541cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a58dfbbb2a350808253a8b5037f5ec5b9a68516d
+refs/heads/master: e6019db5a7f110839c62cefc073b6dc1143d6403
diff --git a/trunk/arch/ppc64/boot/main.c b/trunk/arch/ppc64/boot/main.c
index da12ea2ca464..677e4187497b 100644
--- a/trunk/arch/ppc64/boot/main.c
+++ b/trunk/arch/ppc64/boot/main.c
@@ -17,7 +17,6 @@
 
 extern void *finddevice(const char *);
 extern int getprop(void *, const char *, void *, int);
-extern void printk(char *fmt, ...);
 extern void printf(const char *fmt, ...);
 extern int sprintf(char *buf, const char *fmt, ...);
 void gunzip(void *, int, unsigned char *, int *);
diff --git a/trunk/arch/ppc64/boot/prom.c b/trunk/arch/ppc64/boot/prom.c
index d5218b15824e..5e48b80ff5a0 100644
--- a/trunk/arch/ppc64/boot/prom.c
+++ b/trunk/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, ...)
 {